diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-15 19:42:35 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-15 19:42:35 +0000 |
| commit | ca4d0741c8be1671efa6f4226c7fe3d72150e3a7 (patch) | |
| tree | 443db84dee638c3ea40c8280dc536597787ef469 /testing | |
| parent | e9a0d6ecb6e0ee28fb46bafacf4580acc4f6c248 (diff) | |
| download | aports-ca4d0741c8be1671efa6f4226c7fe3d72150e3a7.tar.bz2 aports-ca4d0741c8be1671efa6f4226c7fe3d72150e3a7.tar.xz | |
testing/firefox: fix x86 build
explicitly disable stackwalk for linux
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/firefox/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/firefox/disable-moz-stackwalk.patch | 23 |
2 files changed, 18 insertions, 11 deletions
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD index fd0d59994b..76b650ea18 100644 --- a/testing/firefox/APKBUILD +++ b/testing/firefox/APKBUILD @@ -233,7 +233,7 @@ bc81fa31947912c661c6a9c592ff1e46 fix-tools.patch 61bd5cee35cb0c0395f43fcf599d0749 fix-arm-atomics-grsec.patch d209d8fc7c4f06d94e4bda097c0178bf fix-arm-version-detect.patch 308ba5b54116a035fe68d0d5c3974857 mozilla-build-arm.patch -522121e8311f9a41a35100d3e8bf208c disable-moz-stackwalk.patch +5d058c89f6e4384f78068a6a983eb224 disable-moz-stackwalk.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" sha256sums="5da027350aee148dc62cc1ca897db30510be87ca8eab5e67a7adc7a2479b8616 firefox-50.0.source.tar.xz @@ -250,7 +250,7 @@ cd19195cb4c316ad9f7d377cd8581218c888863b1bc4d112c97f48a4425fb946 fix-fortify-sy 190113423b892b881c9ab044d16087b34f512b636eb759e0f6fec1356836596b fix-arm-atomics-grsec.patch 1c1ca7a60bcb571f3d2894a9b6ced9c57705f7b737e1e64a9cd451f91c2d3705 fix-arm-version-detect.patch 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3 mozilla-build-arm.patch -fada00b54afca08230207691d3a3c5cf3de6bd64de64dc09d07e3afc46fd688b disable-moz-stackwalk.patch +17ad8d3e3b1b93cf29f0360f52cb033771c1b57aa26cce8b1d64444500a54b09 disable-moz-stackwalk.patch b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" sha512sums="cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76 firefox-50.0.source.tar.xz @@ -267,6 +267,6 @@ bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336d00058d55836cedc970aeadd6a82c6dcd7bc0fb746e564d8b478cc6c fix-arm-atomics-grsec.patch 015e1ff6dbf920033982b5df95d869a0b7bf56c6964e45e50649ddf46d1ce09563458e45240c3ecb92808662b1300b67507f7af272ba184835d91068a9e7d5b0 fix-arm-version-detect.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch -fb4a3a7e48690f149aecf7b7373bdfa97e661b50ce292bfde2651ddc3be534207bbbc5862be515a7fe3bc0dc7911c55112345307384d83705028558cbf64037b disable-moz-stackwalk.patch +4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188 disable-moz-stackwalk.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/testing/firefox/disable-moz-stackwalk.patch b/testing/firefox/disable-moz-stackwalk.patch index 7f0f280dec..c83ae7eae9 100644 --- a/testing/firefox/disable-moz-stackwalk.patch +++ b/testing/firefox/disable-moz-stackwalk.patch @@ -1,11 +1,18 @@ ---- ./mozglue/misc/StackWalk.cpp.orig -+++ ./mozglue/misc/StackWalk.cpp -@@ -42,7 +42,7 @@ +diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp +index a208bad..14e1f0d 100644 +--- a/mozglue/misc/StackWalk.cpp ++++ b/mozglue/misc/StackWalk.cpp +@@ -41,13 +41,7 @@ static CriticalAddress gCriticalAddress; + #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 #endif - #if (defined(linux) && \ +-#if (defined(linux) && \ - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ -+ ((defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || \ - defined(HAVE__UNWIND_BACKTRACE))) - #define MOZ_STACKWALK_SUPPORTS_LINUX 1 - #else +- defined(HAVE__UNWIND_BACKTRACE))) +-#define MOZ_STACKWALK_SUPPORTS_LINUX 1 +-#else + #define MOZ_STACKWALK_SUPPORTS_LINUX 0 +-#endif + + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) + #define HAVE___LIBC_STACK_END 1 |