diff options
author | Timo Teräs <timo.teras@iki.fi> | 2016-03-11 14:19:04 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-11 14:47:05 +0000 |
commit | 44c9895cde49981633d8351f83822d57131cc534 (patch) | |
tree | 7201a6c90b8b81b14e8fd88c22cc02b545cdbbcd /testing/firefox/disable-moz-stackwalk.patch | |
parent | 309637ea3d1d4d9ea735ad88dfc5eeb0b40e0630 (diff) | |
download | aports-44c9895cde49981633d8351f83822d57131cc534.tar.bz2 aports-44c9895cde49981633d8351f83822d57131cc534.tar.xz |
testing/firefox: fix x86 build
Diffstat (limited to 'testing/firefox/disable-moz-stackwalk.patch')
-rw-r--r-- | testing/firefox/disable-moz-stackwalk.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/testing/firefox/disable-moz-stackwalk.patch b/testing/firefox/disable-moz-stackwalk.patch new file mode 100644 index 0000000000..f4e14038b4 --- /dev/null +++ b/testing/firefox/disable-moz-stackwalk.patch @@ -0,0 +1,17 @@ +MOZ_STACKWALK_SUPPORTS_LINUX requires GLIBC extensions, Android or +libunwind. Disable it unconditionally now as otherwise x86 build fails. + +--- firefox-45.0/mozglue/misc/StackWalk.cpp.orig ++++ firefox-45.0/mozglue/misc/StackWalk.cpp +@@ -42,10 +42,7 @@ + (defined(XP_DARWIN) && \ + (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE))) + +-#define MOZ_STACKWALK_SUPPORTS_LINUX \ +- (defined(linux) && \ +- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ +- defined(HAVE__UNWIND_BACKTRACE))) ++#define MOZ_STACKWALK_SUPPORTS_LINUX 0 + + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) + #define HAVE___LIBC_STACK_END 1 |