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

Make the ffi cache the same as sm cache but with ".ffi" on the end

Allows caching in gitlab.
parent 64210055
No related branches found
No related tags found
No related merge requests found
Pipeline #6199 passed
......@@ -59,7 +59,7 @@ $(JS_SRC): | $(3RDPSRCDIR)
$(JS_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.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 | $(JS_SRC) $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.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 | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)/libmozjs.tgz
......@@ -77,6 +77,7 @@ $(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/build/js_src_jsnativ
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-disable-shell.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-no-rwx-pages.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-darwin-configure.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-keep-ffi-cache.patch
-$(QUIET)cd $(JS_SRC)/js-1.8.5/js/src && autoconf-2.13
$(QUIET)cd $(JS_SRC)/js-1.8.5/js/src && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS)
ifdef VERBOSE
......
--- js-1.8.5/js/src/configure.orig 2024-03-20 12:55:27
+++ js-1.8.5/js/src/configure 2024-03-20 12:56:19
@@ -16193,7 +16193,7 @@
# from our configure.
mkdir -p $_objdir/ctypes/libffi
old_cache_file=$cache_file
- cache_file=$_objdir/ctypes/libffi/config.cache
+ cache_file=$cache_file.ffi
old_config_files=$CONFIG_FILES
unset CONFIG_FILES
--- js-1.8.5/js/src/configure.in.orig 2024-03-20 12:58:07
+++ js-1.8.5/js/src/configure.in 2024-03-20 12:58:50
@@ -6147,7 +6147,7 @@
# from our configure.
mkdir -p $_objdir/ctypes/libffi
old_cache_file=$cache_file
- cache_file=$_objdir/ctypes/libffi/config.cache
+ cache_file=$cache_file.ffi
old_config_files=$CONFIG_FILES
unset CONFIG_FILES
AC_OUTPUT_SUBDIRS(ctypes/libffi)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment