aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-09-19 20:31:46 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-09-19 20:36:10 +0200
commitd732346e14b786ac1cf1a809be4bef561f45de45 (patch)
tree4a3d78c8c848c7714f4bb165da7fec6c38bfaca4 /community
parent0ab83ab7bf0ae1c62a906ab2fc40176502239c73 (diff)
downloadaports-d732346e14b786ac1cf1a809be4bef561f45de45.tar.bz2
aports-d732346e14b786ac1cf1a809be4bef561f45de45.tar.xz
community/firefox-esr: fix arm build
Diffstat (limited to 'community')
-rw-r--r--community/firefox-esr/APKBUILD6
-rw-r--r--community/firefox-esr/fix-arm-version-detect.patch13
2 files changed, 18 insertions, 1 deletions
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index 643106a7dd..0a5177b9ad 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -38,7 +38,7 @@ depends_dev="
wireless-tools-dev
"
makedepends="$depends_dev
- autoconf
+ autoconf2.13
automake
bsd-compat-headers
libtool
@@ -57,6 +57,7 @@ source="http://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-
0002-Use-C99-math-isfinite.patch
fix-arm-atomics-grsec.patch
+ fix-arm-version-detect.patch
fix-toolkit.patch
fix-tools.patch
fix-seccomp-bpf.patch
@@ -174,6 +175,7 @@ md5sums="616b65d9a6c053f6380d68655eb97c48 firefox-45.3.0esr.source.tar.xz
99b27aeac58923f318d083e5e71879ba vendor.js
6ab77b80c8c7d6fd07ab53c54561f4df 0002-Use-C99-math-isfinite.patch
b18bd948aae828e5c8f5f63e440c96d6 fix-arm-atomics-grsec.patch
+d209d8fc7c4f06d94e4bda097c0178bf fix-arm-version-detect.patch
94ae976a54d1f84bf13d059c1e44ddf5 fix-toolkit.patch
fe88db05a9a1adfd79babd137b0e8de8 fix-tools.patch
aed3b88014fbfbe73db79851e52ca7fa fix-seccomp-bpf.patch
@@ -194,6 +196,7 @@ sha256sums="922233c65c0aabd05371974c289495119c28d72fc7f8b06a22b58c5f70f8b8f7 fi
afecb8c17a2bedafe600dd572d24eff24e540cda02f675705d11168040379ce6 vendor.js
080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e 0002-Use-C99-math-isfinite.patch
ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5 fix-arm-atomics-grsec.patch
+1c1ca7a60bcb571f3d2894a9b6ced9c57705f7b737e1e64a9cd451f91c2d3705 fix-arm-version-detect.patch
195cc0b2008f6728e9d85ca787960bb47d7fba723e10d29e255baaa3bd5dd4dc fix-toolkit.patch
b7d43391006443da851c03546f2772ded7770a0ea045e8130be7011cf6718708 fix-tools.patch
517d95225b3323c373c11da6ab867deb76ffdb0b50c1762bdd893abd9b39d4c9 fix-seccomp-bpf.patch
@@ -214,6 +217,7 @@ e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd
cc10dba32d9c7faf1d99b8fdebc71bf0200ad10b976105edb45df696bf64a668b2b7aa8c3892a8056eb71fb071b0e0ae51c3ce2fb75acfb7e7035104c0e4fce3 vendor.js
7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8 0002-Use-C99-math-isfinite.patch
4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d fix-arm-atomics-grsec.patch
+015e1ff6dbf920033982b5df95d869a0b7bf56c6964e45e50649ddf46d1ce09563458e45240c3ecb92808662b1300b67507f7af272ba184835d91068a9e7d5b0 fix-arm-version-detect.patch
d3f2ec8684aa485e1d08df325281629adb120f2e79c0065b96e14b99ca2968a3c701d18dda1fd1cab482aec2bc4ee8f294b9fda970ae159f8dab655f2c91aca9 fix-toolkit.patch
6322912a8b496332c593ee5c2069d346552299781148d6c829321a10be7f6550a6f7aab3d0cfeb08e1c4ecca2a79272ea7a6f31f1d2eb430c1b0041e3699c06c fix-tools.patch
70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch
diff --git a/community/firefox-esr/fix-arm-version-detect.patch b/community/firefox-esr/fix-arm-version-detect.patch
new file mode 100644
index 0000000000..c0c2a2e830
--- /dev/null
+++ b/community/firefox-esr/fix-arm-version-detect.patch
@@ -0,0 +1,13 @@
+diff --git a/build/autoconf/arch.m4 b/build/autoconf/arch.m4
+index b62ea71..53179a7 100644
+--- a/build/autoconf/arch.m4
++++ b/build/autoconf/arch.m4
+@@ -215,7 +215,7 @@ if test "$CPU_ARCH" = "arm"; then
+
+ AC_MSG_CHECKING(ARM version support in compiler)
+ dnl Determine the target ARM architecture (5 for ARMv5, v5T, v5E, etc.; 6 for ARMv6, v6K, etc.)
+- ARM_ARCH=`${CC-cc} ${CFLAGS} -dM -E - < /dev/null | sed -n 's/.*__ARM_ARCH_\([[0-9]][[0-9]]*\).*/\1/p'`
++ ARM_ARCH=`${CC-cc} ${CFLAGS} -dM -E - < /dev/null | sed -n 's/.*__ARM_ARCH_\([[0-9]][[0-9]]*\).*/\1/p' | head -n 1`
+ AC_MSG_RESULT("$ARM_ARCH")
+
+ AC_MSG_CHECKING(for ARM NEON support in compiler)