Date: Sat, 2 Jun 2012 15:10:13 GMT From: Jan Beich <jbeich@tormail.org> To: gecko@FreeBSD.org Subject: Re: ports/163454: [patch] www/firefox-beta: unbreak with libc++ Message-ID: <201206021510.q52FADVO028908@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/163454; it has been noted by GNATS.
From: Jan Beich <jbeich@tormail.org>
To: bug-followup@freebsd.org
Cc:
Subject: Re: ports/163454: [patch] www/firefox-beta: unbreak with libc++
Date: Sat, 02 Jun 2012 20:15:24 +0700
--=-=-=
Content-Type: text/plain
Content-Disposition: inline
unbreak with /head@r236444
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=unwind.diff
Index: Mk/bsd.gecko.mk
===================================================================
RCS file: /a/.csup/ports/Mk/bsd.gecko.mk,v
retrieving revision 1.59
diff -u -p -r1.59 bsd.gecko.mk
--- Mk/bsd.gecko.mk 1 Jun 2012 05:15:42 -0000 1.59
+++ Mk/bsd.gecko.mk 2 Jun 2012 13:13:43 -0000
@@ -783,6 +797,7 @@
@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
+ ${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
fi
.endfor
@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
Index: www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
===================================================================
RCS file: /a/.csup/ports/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-xpcom_base_nsStackWalk.cpp
--- www/firefox/files/patch-xpcom_base_nsStackWalk.cpp 22 Mar 2011 15:24:49 -0000 1.2
+++ www/firefox/files/patch-xpcom_base_nsStackWalk.cpp 2 Jun 2012 12:45:25 -0000
@@ -9,3 +9,11 @@
#include <dlfcn.h>
#endif
+@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206021510.q52FADVO028908>