summaryrefslogtreecommitdiff
path: root/repo/system/js78
diff options
context:
space:
mode:
Diffstat (limited to 'repo/system/js78')
-rw-r--r--repo/system/js78/disable-jslint.patch (renamed from repo/system/js78/patches/disable-jslint.patch)0
-rw-r--r--repo/system/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch (renamed from repo/system/js78/patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch)0
-rw-r--r--repo/system/js78/fix-musl-build.patch (renamed from repo/system/js78/patches/fix-musl-build.patch)0
-rw-r--r--repo/system/js78/fix-python3.10-compilation.patch (renamed from repo/system/js78/patches/fix-python3.10-compilation.patch)0
-rw-r--r--repo/system/js78/fix-rust-target.patch (renamed from repo/system/js78/patches/fix-rust-target.patch)0
-rw-r--r--repo/system/js78/fix-rust-target.patch.115
-rw-r--r--repo/system/js78/js78.xibuild18
7 files changed, 23 insertions, 10 deletions
diff --git a/repo/system/js78/patches/disable-jslint.patch b/repo/system/js78/disable-jslint.patch
index 04a8b3e..04a8b3e 100644
--- a/repo/system/js78/patches/disable-jslint.patch
+++ b/repo/system/js78/disable-jslint.patch
diff --git a/repo/system/js78/patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch b/repo/system/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
index 1af68d9..1af68d9 100644
--- a/repo/system/js78/patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+++ b/repo/system/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
diff --git a/repo/system/js78/patches/fix-musl-build.patch b/repo/system/js78/fix-musl-build.patch
index af39467..af39467 100644
--- a/repo/system/js78/patches/fix-musl-build.patch
+++ b/repo/system/js78/fix-musl-build.patch
diff --git a/repo/system/js78/patches/fix-python3.10-compilation.patch b/repo/system/js78/fix-python3.10-compilation.patch
index 4473d9b..4473d9b 100644
--- a/repo/system/js78/patches/fix-python3.10-compilation.patch
+++ b/repo/system/js78/fix-python3.10-compilation.patch
diff --git a/repo/system/js78/patches/fix-rust-target.patch b/repo/system/js78/fix-rust-target.patch
index f1a98df..f1a98df 100644
--- a/repo/system/js78/patches/fix-rust-target.patch
+++ b/repo/system/js78/fix-rust-target.patch
diff --git a/repo/system/js78/fix-rust-target.patch.1 b/repo/system/js78/fix-rust-target.patch.1
new file mode 100644
index 0000000..f1a98df
--- /dev/null
+++ b/repo/system/js78/fix-rust-target.patch.1
@@ -0,0 +1,15 @@
+Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's
+weird custom build system...
+
+diff -upr firefox-68.9.0.orig/build/moz.configure/rust.configure firefox-68.9.0/build/moz.configure/rust.configure
+--- firefox-68.9.0.orig/build/moz.configure/rust.configure 2020-06-02 22:54:39.982616128 +0200
++++ firefox-68.9.0/build/moz.configure/rust.configure 2020-06-02 23:08:37.656332899 +0200
+@@ -345,7 +345,7 @@ def rust_triple_alias(host_or_target):
+
+ return None
+
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ['RUST_TARGET']
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(
diff --git a/repo/system/js78/js78.xibuild b/repo/system/js78/js78.xibuild
index 199740a..9e553ed 100644
--- a/repo/system/js78/js78.xibuild
+++ b/repo/system/js78/js78.xibuild
@@ -1,15 +1,16 @@
#!/bin/sh
-MAKEDEPS="gcc autoconf2-13 icu rustc zlib which zip clang llvm patch make python-six python-mach"
+MAKEDEPS="gcc autoconf2-13 icu rust zlib which zip clang llvm patch make python-six python-mach"
DEPS="readline nspr bash zlib"
PKG_VER=78.15.0
SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz
ADDITIONAL="
- patches/disable-jslint.patch
- patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
- patches/fix-musl-build.patch
- patches/fix-python3.10-compilation.patch
+ disable-jslint.patch
+ fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+ fix-musl-build.patch
+ fix-python3.10-compilation.patch
+ fix-rust-target.patch
"
DESC="JavaScript interpreter and libraries - Version 78"
@@ -19,9 +20,8 @@ prepare () {
export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576"
mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm
- export PATH=/opt/rustc/bin:$PATH
- export LD_LIBRARY_PATH=/opt/rustc/lib:$LD_LIBRARY_PATH
- export RUST_TARGET="x86_64"
+ export RUST_TARGET="x86_64-unknown-linux-musl"
+ export CFLAGS="$CFLAGS -no-pie" CXXFLAGS="$CXXFLAGS -no-pie"
}
build () {
@@ -31,7 +31,6 @@ build () {
SHELL=/bin/bash PYTHON=/usr/bin/python3 \
../js/src/configure --prefix=/usr \
--with-intl-api \
- --with-libclang-path=/usr/lib \
--with-system-icu \
--with-system-nspr \
--with-system-zlib \
@@ -48,7 +47,6 @@ build () {
--disable-jemalloc \
--disable-strip
-
make
}