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

Add a couple more patches that appear to enable libmozjs on Raspian

This works on Buster at least... update the other config.guess file
the same as the top-level one, and always define JaegerSpew() so the
JIT stuff isn't broken.
parent c045a5f2
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
Pipeline #6280 failed
......@@ -38,9 +38,8 @@ include:
- local: '.gitlab-ci-unix.yml'
inputs:
os: 'raspian'
platform: 'aarch64'
platform: 'armhf-on-aarch64'
tagname: 'RaspberryPi'
no_javascript: 'yes'
build_flags: 'CC="ccache cc" CXX="ccache c++" RELEASE=1'
- local: '.gitlab-ci-unix.yml'
inputs:
......
......@@ -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 $(3RDP_ROOT)/build/js-keep-ffi-cache.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 $(3RDP_ROOT)/build/js-always-define-spew.patch | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)/libmozjs.tgz
......@@ -78,6 +78,8 @@ $(JSLIB_BUILD): $(3RDP_ROOT)/dist/libmozjs.tgz $(3RDP_ROOT)/build/js_src_jsnativ
$(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)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 && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS)
ifdef VERBOSE
......
--- 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"
This diff is collapsed.
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