diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-18 23:14:43 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-18 21:15:31 +0000 |
| commit | e7406cbaa68758ca108849591f46f930a3b54c01 (patch) | |
| tree | 0483a4170ed32991854bdddfa599606c0a5afe70 /community/firefox-esr/disable-moz-stackwalk.patch | |
| parent | 08d1a579e2842c0ac1abd328fe236f0ad2e7b809 (diff) | |
| download | aports-e7406cbaa68758ca108849591f46f930a3b54c01.tar.bz2 aports-e7406cbaa68758ca108849591f46f930a3b54c01.tar.xz | |
community/firefox-esr: upgrade to 52.0.2
Diffstat (limited to 'community/firefox-esr/disable-moz-stackwalk.patch')
| -rw-r--r-- | community/firefox-esr/disable-moz-stackwalk.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/community/firefox-esr/disable-moz-stackwalk.patch b/community/firefox-esr/disable-moz-stackwalk.patch index f4e14038b4..c83ae7eae9 100644 --- a/community/firefox-esr/disable-moz-stackwalk.patch +++ b/community/firefox-esr/disable-moz-stackwalk.patch @@ -1,17 +1,18 @@ -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))) +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 --#define MOZ_STACKWALK_SUPPORTS_LINUX \ -- (defined(linux) && \ -- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ -- defined(HAVE__UNWIND_BACKTRACE))) -+#define MOZ_STACKWALK_SUPPORTS_LINUX 0 +-#if (defined(linux) && \ +- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ +- 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 |