Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated spidermonkey to 78.10.1

Browse Source
This commit is contained in:
Berk Çakar
2021-05-29 15:01:51 +03:00
parent e7913bc006
commit 4d636383ac
4 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/spidermonkey/actions.py
+13 -13
View File
@@ -18,17 +18,16 @@ def setup():
#shelltools.system("sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl ") #shelltools.system("sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl ")
shelltools.export("CC", "gcc") shelltools.export("CC", "gcc")
shelltools.export("CXX", "g++") shelltools.export("CXX", "g++")
shelltools.system("mkdir -p build-js") shelltools.system("mkdir -p build-js")
shelltools.cd("build-js") shelltools.cd("build-js")
shelltools.system("../js/src/configure \ shelltools.system("../js/src/configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib \ --libdir=/usr/lib \
--enable-readline \ --enable-readline \
--enable-posix-nspr-emulation \
--with-intl-api \ --with-intl-api \
--disable-debug \ --disable-debug \
--disable-debug-symbols \ --disable-debug-symbols \
--disable-jemalloc \ --disable-jemalloc \
--disable-strip \ --disable-strip \
@@ -41,30 +40,31 @@ def setup():
--enable-tests \ --enable-tests \
--with-intl-api \ --with-intl-api \
--with-system-zlib \ --with-system-zlib \
--with-system-nspr \
--without-system-icu") --without-system-icu")
def build(): def build():
shelltools.cd("build-js") shelltools.cd("build-js")
autotools.make() autotools.make()
def check(): def check():
shelltools.cd("build-js") shelltools.cd("build-js")
#autotools.make("-C js/src check-jstests") #autotools.make("-C js/src check-jstests")
#autotools.make("-C js/src check-jit-test") #autotools.make("-C js/src check-jit-test")
def install(): def install():
shelltools.cd("build-js") shelltools.cd("build-js")
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.remove("/usr/lib/*.ajs") pisitools.remove("/usr/lib/*.ajs")
#for polkit #for polkit
#pisitools.rename("/usr/lib/pkgconfig/mozjs-..pc", "mozjs-17.0.pc") #pisitools.rename("/usr/lib/pkgconfig/mozjs-..pc", "mozjs-17.0.pc")
#pisitools.remove("usr/lib/libmozjs-..a") #pisitools.remove("usr/lib/libmozjs-..a")
shelltools.cd("..") shelltools.cd("..")
pisitools.dodoc("README*") pisitools.dodoc("README*")
# add link for polkit # add link for polkit
#pisitools.dosym("libmozjs-..so", "/usr/lib/libmozjs-17.0.so") #pisitools.dosym("libmozjs-..so", "/usr/lib/libmozjs-17.0.so")
system/base/spidermonkey/files/mozjs68-fix-soname.patch → system/base/spidermonkey/files/mozjs78-fix-soname.patch
+7 -8
View File
@@ -1,6 +1,6 @@
diff -Nuar a/js/src/build/Makefile.in b/js/src/build/Makefile.in "Carried over from mozjs68"
--- a/js/src/build/Makefile.in 2020-07-20 21:02:51.000000000 +0000 --- a/js/src/build/Makefile.in
+++ b/js/src/build/Makefile.in 2020-08-28 15:16:55.659934940 +0000 +++ b/js/src/build/Makefile.in
@@ -78,6 +78,8 @@ @@ -78,6 +78,8 @@
endif endif
ifneq (,$(SHARED_LIBRARY)) ifneq (,$(SHARED_LIBRARY))
@@ -10,14 +10,13 @@ diff -Nuar a/js/src/build/Makefile.in b/js/src/build/Makefile.in
ifeq ($(OS_ARCH),Darwin) ifeq ($(OS_ARCH),Darwin)
install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
endif endif
diff -Nuar a/js/src/build/moz.build b/js/src/build/moz.build --- a/js/src/build/moz.build
--- a/js/src/build/moz.build 2020-07-20 21:02:51.000000000 +0000 +++ b/js/src/build/moz.build
+++ b/js/src/build/moz.build 2020-08-28 15:18:37.389927600 +0000
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
if CONFIG['JS_SHARED_LIBRARY']: if CONFIG['JS_SHARED_LIBRARY']:
GeckoSharedLibrary('js', linkage=None) GeckoSharedLibrary('js', linkage=None)
SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
+ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)] + LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
# Ensure symbol versions of shared library on Linux do not conflict # Ensure symbol versions of shared library on Linux do not conflict
# with those in libxul. # with those in libxul.
system/base/spidermonkey/files/mozjs78-silence-sandbox-violations.patch
+27
View File
@@ -0,0 +1,27 @@
"Carried over + updated from mozjs68"
Upstream: no
From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed, 5 Sep 2018 15:05:24 +0200
Subject: [PATCH] silence sandbox violations
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
1 file changed, 5 deletions(-)
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin):
'is a filename, but a directory is required: %s '
'(resolved to %s)' % (local_include, full_path),
context)
- if (full_path == context.config.topsrcdir or
- full_path == context.config.topobjdir):
- raise SandboxValidationError(
- 'Path specified in LOCAL_INCLUDES '
- '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
- 'not allowed' % (local_include, full_path), context)
include_obj = LocalInclude(context, local_include)
local_includes.append(include_obj.path.full_path)
yield include_obj
system/base/spidermonkey/pspec.xml
+15 -6
View File
@@ -12,18 +12,20 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Stand-alone JavaScript C Library</Summary> <Summary>Stand-alone JavaScript C Library</Summary>
<Description>Spidermonkey is Mozilla's C implementation of JavaScript.</Description> <Description>Spidermonkey is Mozilla's C implementation of JavaScript.</Description>
<Archive type="tarxz" sha1sum="976fae5c3cdee8b7929e4f17eca6cf44513d08b4">https://ftp.mozilla.org/pub/firefox/releases/68.12.0esr/source/firefox-68.12.0esr.source.tar.xz</Archive> <Archive type="tarxz" sha1sum="9e8ed091437e8eed3807e40e7dd798db9f788dd2">https://ftp.mozilla.org/pub/firefox/releases/78.10.1esr/source/firefox-78.10.1esr.source.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>python3</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>nspr-devel</Dependency> <Dependency>nspr-devel</Dependency>
<Dependency>readline-devel</Dependency> <Dependency>readline-devel</Dependency>
<Dependency>libffi-devel</Dependency>
<Dependency>autoconf213</Dependency> <Dependency>autoconf213</Dependency>
<Dependency>rust</Dependency>
<Dependency>llvm</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">Remove-unused-LLVM-and-Rust-build-dependencies.patch</Patch> <Patch level="1">mozjs78-silence-sandbox-violations.patch</Patch>
<Patch level="1">mozjs68-fix-soname.patch</Patch> <Patch level="1">mozjs78-fix-soname.patch</Patch>
<!--Patch level="1">Remove-unused-LLVM-and-Rust-build-dependencies.patch</Patch-->
</Patches> </Patches>
</Source> </Source>
@@ -53,11 +55,18 @@
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
<!-- <Path fileType="executable">/usr/bin/js17-config</Path> --> <!--Path fileType="executable">/usr/bin/js17-config</Path-->
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="11">
<Date>2021-05-28</Date>
<Version>78.10.1</Version>
<Comment>Version bump</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
<Update release="10"> <Update release="10">
<Date>2020-12-09</Date> <Date>2020-12-09</Date>
<Version>68.12.0</Version> <Version>68.12.0</Version>