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

The problem with Bullseye was the 64-bit kernel.

The configure script was using uname -m as the build platform, but
Bullseye on RPi uses a 64-bit kernel (aarch64 uname -m) with a 32-bit
userland (arm gcc build host), which resulted in a lot of bad decsions
around JIT stuff.

With this change, we explicitly pass the build/host/target values as
taken from the compilers in question, which fixes the issue for Bullseye
(But may break mingw32?  Well we'll see how the pipes go).
parent 90de10cf
Branches
Tags
1 merge request!455Update branch with changes from master
Pipeline #6283 passed
......@@ -33,6 +33,9 @@ ifneq ($(os),linux)
JS_CONFIGURE_ARGS += '--disable-tracejit'
endif
endif
JS_CONFIGURE_ARGS += --build=$(shell gcc -v 2>&1 | awk '/^Target:/ {print $$2}')
JS_CONFIGURE_ARGS += --host=$(shell $(CC) -v 2>&1 | awk '/^Target:/ {print $$2}')
JS_CONFIGURE_ARGS += --target=$(shell $(CC) -v 2>&1 | awk '/^Target:/ {print $$2}')
ifeq ($(os),darwin)
JS_CONFIGURE_ARGS += '--enable-macos-target=${MIN_MAC_OSX_VERSION}'
endif
......@@ -59,7 +62,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 $(3RDP_ROOT)/build/js-keep-ffi-cache.patch $(3RDP_ROOT)/build/js-config.guess-libffi.patch $(3RDP_ROOT)/build/js-always-define-spew.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 $(3RDP_ROOT)/build/js-config.guess-libffi.patch | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)/libmozjs.tgz
......@@ -79,8 +82,8 @@ $(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/build/js_src_jsnativ
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-darwin-configure.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-keep-ffi-cache.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-config.guess-libffi.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-always-define-spew.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)cd $(JS_SRC)/js-1.8.5/js/src && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS)
ifdef VERBOSE
$(QUIET)$(MAKE) -C $(JS_SRC)/js-1.8.5/js/src
......
--- js-1.8.5/js/src/methodjit/Logging.h.orig 2011-03-31 15:08:36.000000000 -0400
+++ js-1.8.5/js/src/methodjit/Logging.h 2024-03-24 18:12:15.113345000 -0400
@@ -38,7 +38,7 @@
*
* ***** END LICENSE BLOCK ***** */
-#if !defined jsjaeger_logging_h__ && (defined JS_METHODJIT || defined JS_TRACER)
+#if !defined jsjaeger_logging_h__
#define jsjaeger_logging_h__
#include "prmjtime.h"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment