diff options
| author | davidovski <david@davidovski.xyz> | 2022-05-25 22:50:03 +0100 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-05-25 22:50:03 +0100 |
| commit | 7b0628f037dcbf85cfb381d5e05dea39a2059d33 (patch) | |
| tree | 4a534ef861d19cdf5235b504af5be2a5d0becb71 /repo/system/js78/js78.xibuild | |
| parent | 79062a39e9bcb9731adbacd0bd9bcd0b59d19d0a (diff) | |
fixed various broken dependencies
Diffstat (limited to 'repo/system/js78/js78.xibuild')
| -rw-r--r-- | repo/system/js78/js78.xibuild | 18 |
1 files changed, 8 insertions, 10 deletions
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 } |