spidermonkey-68.11.0
This commit is contained in:
Rmys
GitHub
@@ -47,7 +47,8 @@ def build():
|
|||||||
def check():
|
def check():
|
||||||
shelltools.cd("build-js")
|
shelltools.cd("build-js")
|
||||||
|
|
||||||
autotools.make("-C js/src check-jstests check-jit-test")
|
#autotools.make("-C js/src check-jstests")
|
||||||
|
#autotools.make("-C js/src check-jit-test")
|
||||||
|
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
Description: Remove unused LLVM and Rust build dependencies
|
||||||
|
Since the Javascript engine is normally part of Firefox, its build
|
||||||
|
system has dependencies on the LLVM and Rust toolchains. This limits
|
||||||
|
the number of architectures which mozjs68 can be built on.
|
||||||
|
.
|
||||||
|
It turns out, however, that neither LLVM nor Rust are used when mozjs68
|
||||||
|
is being built and these build dependencies are therefore not necessary.
|
||||||
|
.
|
||||||
|
This patch removes them and allows mozjs68 to be built on any architecture.
|
||||||
|
.
|
||||||
|
Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
||||||
|
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144
|
||||||
|
Forwarded: no
|
||||||
|
Last-Update: 2020-04-30
|
||||||
|
|
||||||
|
Index: mozjs68-68.6.0/js/moz.configure
|
||||||
|
===================================================================
|
||||||
|
--- mozjs68-68.6.0.orig/js/moz.configure
|
||||||
|
+++ mozjs68-68.6.0/js/moz.configure
|
||||||
|
@@ -18,11 +18,6 @@ def building_js(build_project):
|
||||||
|
option(env='JS_STANDALONE', default=building_js,
|
||||||
|
help='Reserved for internal use')
|
||||||
|
|
||||||
|
-include('../build/moz.configure/rust.configure',
|
||||||
|
- when='--enable-compile-environment')
|
||||||
|
-include('../build/moz.configure/bindgen.configure',
|
||||||
|
- when='--enable-compile-environment')
|
||||||
|
-
|
||||||
|
@depends('JS_STANDALONE')
|
||||||
|
def js_standalone(value):
|
||||||
|
if value:
|
||||||
|
Index: mozjs68-68.6.0/moz.configure
|
||||||
|
===================================================================
|
||||||
|
--- mozjs68-68.6.0.orig/moz.configure
|
||||||
|
+++ mozjs68-68.6.0/moz.configure
|
||||||
|
@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags
|
||||||
|
|
||||||
|
check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
|
||||||
|
|
||||||
|
-
|
||||||
|
-@depends(host_c_compiler, c_compiler, bindgen_config_paths)
|
||||||
|
-def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
|
||||||
|
- clang = None
|
||||||
|
- for compiler in (host_c_compiler, c_compiler):
|
||||||
|
- if compiler and compiler.type == 'clang':
|
||||||
|
- clang = compiler.compiler
|
||||||
|
- break
|
||||||
|
- elif compiler and compiler.type == 'clang-cl':
|
||||||
|
- clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')
|
||||||
|
- break
|
||||||
|
-
|
||||||
|
- if not clang and bindgen_config_paths:
|
||||||
|
- clang = bindgen_config_paths.clang_path
|
||||||
|
- llvm_objdump = 'llvm-objdump'
|
||||||
|
- if clang:
|
||||||
|
- out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',
|
||||||
|
- onerror=lambda: None)
|
||||||
|
- if out:
|
||||||
|
- llvm_objdump = out.rstrip()
|
||||||
|
- return (llvm_objdump,)
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
|
||||||
|
- when='--enable-compile-environment',
|
||||||
|
- paths=toolchain_search_path)
|
||||||
|
-
|
||||||
|
-add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
|
||||||
|
-
|
||||||
|
-
|
||||||
|
# Please do not add configure checks from here on.
|
||||||
|
|
||||||
|
# Fallthrough to autoconf-based configure
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
diff -Nuar a/js/src/build/Makefile.in b/js/src/build/Makefile.in
|
||||||
|
--- a/js/src/build/Makefile.in 2020-07-20 21:02:51.000000000 +0000
|
||||||
|
+++ b/js/src/build/Makefile.in 2020-08-28 15:16:55.659934940 +0000
|
||||||
|
@@ -78,6 +78,8 @@
|
||||||
|
endif
|
||||||
|
ifneq (,$(SHARED_LIBRARY))
|
||||||
|
$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
|
||||||
|
+ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
|
||||||
|
+ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
|
||||||
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
|
install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
|
||||||
|
endif
|
||||||
|
diff -Nuar a/js/src/build/moz.build b/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 2020-08-28 15:18:37.389927600 +0000
|
||||||
|
@@ -25,6 +25,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.
|
||||||
@@ -12,8 +12,9 @@
|
|||||||
<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="616f8afdee741f0bea607a671b8515ef13c68b4a">https://ftp.mozilla.org/pub/firefox/releases/60.9.0esr/source/firefox-60.9.0esr.source.tar.xz</Archive>
|
<Archive type="tarxz" sha1sum="445acbf7b7b8f75374ee6347bb6f45748511bcf9">https://ftp.mozilla.org/pub/firefox/releases/68.11.0esr/source/firefox-68.11.0esr.source.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
|
<Dependency>python3</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>
|
||||||
@@ -21,8 +22,8 @@
|
|||||||
<Dependency>autoconf213</Dependency>
|
<Dependency>autoconf213</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">bug1415202.patch</Patch>
|
<Patch level="1">Remove-unused-LLVM-and-Rust-build-dependencies.patch</Patch>
|
||||||
<Patch level="1">mozjs60-fix-soname.patch</Patch>
|
<Patch level="1">mozjs68-fix-soname.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -52,11 +53,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="8">
|
||||||
|
<Date>2020-08-06</Date>
|
||||||
|
<Version>68.11.0</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="7">
|
<Update release="7">
|
||||||
<Date>2019-10-03</Date>
|
<Date>2019-10-03</Date>
|
||||||
<Version>60.9.0</Version>
|
<Version>60.9.0</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user