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

A couple patches to build on macOS M2

Use standard isfinite() instead of never-standard finite()
Don't use -rpath-link on darwin (since it won't work anyway)
parent 877debc8
No related branches found
No related tags found
No related merge requests found
Pipeline #7080 failed
......@@ -66,7 +66,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 | $(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 | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzpC $(JS_SRC) -f $(3RDPDISTDIR)/libmozjs.tgz
......@@ -91,6 +91,8 @@ $(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/dist/libffi.tgz $(3R
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-support-mingw-cross.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-int-main-conf.patch
$(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)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
......
--- js-1.8.5/js/src/jsnum.h.orig 2024-11-09 02:32:13
+++ js-1.8.5/js/src/jsnum.h 2024-11-09 02:33:18
@@ -101,7 +101,7 @@
#ifdef WIN32
return _finite(d);
#else
- return finite(d);
+ return isfinite(d);
#endif
}
--- js-1.8.5/js/src/ctypes/CTypes.cpp.orig 2024-11-09 02:35:36
+++ js-1.8.5/js/src/ctypes/CTypes.cpp 2024-11-09 02:35:46
@@ -464,7 +464,7 @@
#ifdef WIN32
return _finite(f) != 0;
#else
- return finite(f);
+ return isfinite(f);
#endif
}
--- js-1.8.5/js/src/configure.orig 2024-11-09 02:22:23
+++ js-1.8.5/js/src/configure 2024-11-09 02:27:15
@@ -5543,6 +5543,7 @@
;;
darwin*)
HOST_OS_ARCH=Darwin
+ MOZ_FIX_LINK_PATHS=
;;
linux*)
HOST_OS_ARCH=Linux
@@ -5748,6 +5749,7 @@
OS_TEST=x86_64
;;
*)
+ MOZ_FIX_LINK_PATHS=
if test -z "$CROSS_COMPILE" ; then
OS_TEST=`uname -p`
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