Skip to content
Snippets Groups Projects
Commit fbf8c836 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Patchie patch for libffi prefix

parent 0ad9e7a8
No related branches found
No related tags found
No related merge requests found
Pipeline #7663 failed
......@@ -67,7 +67,7 @@ $(JS_SRC): | $(3RDPSRCDIR)
$(JS_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/dist/libffi.tgz $(3RDP_ROOT)/build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)/build/js-configure.patch $(3RDP_ROOT)/build/js-configure.in.patch $(3RDP_ROOT)/build/imacro-asm-fix.patch $(3RDP_ROOT)/build/js-volatile-outside-functions.patch $(3RDP_ROOT)/build/js-Wno-misleading-indentation.patch $(3RDP_ROOT)/build/js-allow-python3.patch $(3RDP_ROOT)/build/js-no-rwx-pages.patch $(3RDP_ROOT)/build/js-disable-shell.patch $(3RDP_ROOT)/build/js-darwin-configure.patch $(3RDP_ROOT)/build/js-keep-ffi-cache.patch $(3RDP_ROOT)/build/js-support-mingw-cross.patch $(3RDP_ROOT)/build/js-int-main-conf.patch $(3RDP_ROOT)/build/js-include-headers.patch $(3RDP_ROOT)/build/js-macos-configure.patch $(3RDP_ROOT)/build/js-isfinite.patch | $(JS_SRC) $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/dist/libffi.tgz $(3RDP_ROOT)/build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)/build/js-configure.patch $(3RDP_ROOT)/build/js-configure.in.patch $(3RDP_ROOT)/build/imacro-asm-fix.patch $(3RDP_ROOT)/build/js-volatile-outside-functions.patch $(3RDP_ROOT)/build/js-Wno-misleading-indentation.patch $(3RDP_ROOT)/build/js-allow-python3.patch $(3RDP_ROOT)/build/js-no-rwx-pages.patch $(3RDP_ROOT)/build/js-disable-shell.patch $(3RDP_ROOT)/build/js-darwin-configure.patch $(3RDP_ROOT)/build/js-keep-ffi-cache.patch $(3RDP_ROOT)/build/js-support-mingw-cross.patch $(3RDP_ROOT)/build/js-int-main-conf.patch $(3RDP_ROOT)/build/js-include-headers.patch $(3RDP_ROOT)/build/js-macos-configure.patch $(3RDP_ROOT)/build/js-isfinite.patch $(3RDP_ROOT)/build/js-libffi-prefix.patch | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzpC $(JS_SRC) -f $(3RDPDISTDIR)/libmozjs.tgz
......@@ -94,6 +94,7 @@ $(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/dist/libffi.tgz $(3R
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-include-headers.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-macos-configure.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-isfinite.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-libffi-prefix.patch
-$(QUIET)cd $(JS_SRC)/js-1.8.5/js/src && autoconf-2.13
-$(QUIET)cd $(JS_SRC)/js-1.8.5/js/src && autoconf2.13
$(QUIET)chmod 0755 $(JS_SRC)/js-1.8.5/js/src/build/hcc
......@@ -105,6 +106,7 @@ else
$(QUIET)$(MAKE) -s -C $(JS_SRC)/js-1.8.5/js/src
endif
$(QUIET)$(MAKE) -C $(JS_SRC)/js-1.8.5/js/src install
$(QUIET)$(MAKE) -C $(JS_SRC)/js-1.8.5/js/src/ctypes/libffi install
$(CRYPT_SRC): | $(3RDPSRCDIR)
$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_SRC)
......
--- js-1.8.5/js/src/configure.orig 2025-01-07 07:01:33.936406000 -0500
+++ js-1.8.5/js/src/configure 2025-01-07 07:01:56.530360000 -0500
@@ -16234,7 +16234,7 @@
# Build jsctypes if it's enabled.
if test "$JS_HAS_CTYPES"; then
# Run the libffi 'configure' script.
- ac_configure_args="--disable-shared --enable-static --disable-raw-api"
+ ac_configure_args="--disable-shared --enable-static --disable-raw-api --prefix=${prefix}"
if test "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --enable-debug"
fi
--- js-1.8.5/js/src/configure.in.orig 2025-01-07 07:01:42.132746000 -0500
+++ js-1.8.5/js/src/configure.in 2025-01-07 07:02:05.979153000 -0500
@@ -6093,7 +6093,7 @@
# Build jsctypes if it's enabled.
if test "$JS_HAS_CTYPES"; then
# Run the libffi 'configure' script.
- ac_configure_args="--disable-shared --enable-static --disable-raw-api"
+ ac_configure_args="--disable-shared --enable-static --disable-raw-api --prefix=${prefix}"
if test "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --enable-debug"
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment