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/firefox/disable-moz-stackwalk.patch | |
| 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/firefox/disable-moz-stackwalk.patch')
| -rw-r--r-- | testing/firefox/disable-moz-stackwalk.patch | 23 |
1 files changed, 15 insertions, 8 deletions
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 |