aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-12-13 14:51:24 +0100
committerRasmus Thomsen <oss@cogitri.dev>2019-12-19 12:42:48 +0100
commit77aa30a5411ff4fa038a4034cc8f6944d3ea8caf (patch)
treeff20b4dcc5c36b5e55c0826d4c9c4d0207fe9c1e
parentcb571455a0296043f9e43ef180ab187f01ad3dbb (diff)
downloadaports-77aa30a5411ff4fa038a4034cc8f6944d3ea8caf.tar.bz2
aports-77aa30a5411ff4fa038a4034cc8f6944d3ea8caf.tar.xz
testing/firefox: fix on x86_64
-rw-r--r--testing/firefox/APKBUILD10
-rw-r--r--testing/firefox/x86_64-alpine-linux-musl.json35
2 files changed, 44 insertions, 1 deletions
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index 56b58af422..588f563db0 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -14,7 +14,7 @@ makedepends="
bsd-compat-headers
bzip2-dev
cargo
- cbindgen
+ cbindgen~0.9.1
clang-dev
dbus-glib-dev
ffmpeg-dev
@@ -63,6 +63,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
fix-sandbox-membarrier.patch
rust_audio-thread-priority.patch
+ x86_64-alpine-linux-musl.json
firefox.desktop
firefox-safe.desktop"
@@ -101,6 +102,10 @@ prepare() {
default_prepare
cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
+ # Firefox needs to know how our custom triplet on x86_64 behaves.
+ mkdir rust_targets
+ cp "$srcdir"/x86_64-alpine-linux-musl.json rust_targets/.
+
_clear_vendor_checksums audio_thread_priority
}
@@ -114,6 +119,8 @@ build() {
export USE_SHORT_LIBNAME=1
# gcc 6
export CXXFLAGS="-fno-delete-null-pointer-checks -fno-schedule-insns2"
+ # Find our triplet JSON
+ export RUST_TARGET_PATH="$builddir/rust_targets"
# set rpath so linker finds the libs
export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
@@ -249,5 +256,6 @@ a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12
d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79 fix-webrtc-glibcisms.patch
f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2 fix-sandbox-membarrier.patch
18098bae18ce9ead6bca0d93d28e634495fa08a4c0707057f72a9e34205a64a0ce5ab98a4cfc2d492412725b14447eb9553b2976d9620c3d71eba2135c6ba211 rust_audio-thread-priority.patch
+0dfa633abf3f411c90a030c46ee7f8fdde6fdd9f3a0c493599a58633e09b183d6c04590fc1984256e514c1da4f72f43dde3f5dbceef888b08262952b4f894919 x86_64-alpine-linux-musl.json
f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop
5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop"
diff --git a/testing/firefox/x86_64-alpine-linux-musl.json b/testing/firefox/x86_64-alpine-linux-musl.json
new file mode 100644
index 0000000000..5062c38e7e
--- /dev/null
+++ b/testing/firefox/x86_64-alpine-linux-musl.json
@@ -0,0 +1,35 @@
+{
+ "arch": "x86_64",
+ "cpu": "x86-64",
+ "crt-static-default": false,
+ "crt-static-respected": true,
+ "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+ "dynamic-linking": true,
+ "env": "musl",
+ "executables": true,
+ "has-elf-tls": true,
+ "has-rpath": true,
+ "is-builtin": true,
+ "linker-flavor": "gcc",
+ "linker-is-gnu": true,
+ "llvm-target": "x86_64-unknown-linux-musl",
+ "max-atomic-width": 64,
+ "os": "linux",
+ "position-independent-executables": true,
+ "pre-link-args": {
+ "gcc": [
+ "-Wl,--as-needed",
+ "-Wl,-z,noexecstack",
+ "-Wl,--eh-frame-hdr",
+ "-m64"
+ ]
+ },
+ "relro-level": "full",
+ "stack-probes": true,
+ "target-c-int-width": "32",
+ "target-endian": "little",
+ "target-family": "unix",
+ "target-pointer-width": "64",
+ "vendor": "alpine"
+}
+