diff --git a/system/base/spidermonkey/actions.py b/system/base/spidermonkey/actions.py index 22497dd0..3c215e7e 100644 --- a/system/base/spidermonkey/actions.py +++ b/system/base/spidermonkey/actions.py @@ -22,7 +22,7 @@ def setup(): shelltools.system("mkdir -p build-js") shelltools.cd("build-js") - shelltools.system("../js/src/configure \ + shelltools.system("sh ../js/src/configure.in \ --prefix=/usr \ --libdir=/usr/lib \ --enable-readline \ diff --git a/system/base/spidermonkey/files/mozjs78-fix-soname.patch b/system/base/spidermonkey/files/mozjs78-fix-soname.patch index 546157fc..10afaec3 100644 --- a/system/base/spidermonkey/files/mozjs78-fix-soname.patch +++ b/system/base/spidermonkey/files/mozjs78-fix-soname.patch @@ -10,13 +10,29 @@ ifeq ($(OS_ARCH),Darwin) install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) endif ---- a/js/src/build/moz.build -+++ b/js/src/build/moz.build -@@ -25,6 +25,7 @@ - if CONFIG['JS_SHARED_LIBRARY']: - GeckoSharedLibrary('js', linkage=None) - SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] +--- a/js/src/build/moz.build 2022-03-13 17:31:39.000000000 +0300 ++++ b/js/src/build/moz.build 2022-03-21 23:32:34.252893769 +0300 +@@ -26,6 +26,7 @@ + if CONFIG["JS_SHARED_LIBRARY"]: + GeckoSharedLibrary("js", linkage=None) + SHARED_LIBRARY_NAME = CONFIG["JS_LIBRARY_NAME"] + LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)] # Ensure symbol versions of shared library on Linux do not conflict - # with those in libxul. \ No newline at end of file + # with those in libxul. +diff --git a/config/rules.mk b/config/rules.mk +index 0f9b2ac..f6b4efe 100644 +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU) + OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 + endif + ++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 ++ + # + # MINGW32 + # +-- +2.31.1 + diff --git a/system/base/spidermonkey/pspec.xml b/system/base/spidermonkey/pspec.xml index 5621fd21..185c6af8 100644 --- a/system/base/spidermonkey/pspec.xml +++ b/system/base/spidermonkey/pspec.xml @@ -12,7 +12,7 @@ library Stand-alone JavaScript C Library Spidermonkey is Mozilla's C implementation of JavaScript. - https://ftp.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz + https://ftp.mozilla.org/pub/firefox/releases/91.9.1esr/source/firefox-91.9.1esr.source.tar.xz python3-devel zlib-devel @@ -23,7 +23,7 @@ llvm - mozjs78-silence-sandbox-violations.patch + mozjs78-fix-soname.patch @@ -60,6 +60,13 @@ + + 2022-06-01 + 91.9.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-08-07 78.12.0