[SVN-Commit] r715 - in branches/experimental: Mk www/firefox-beta/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Sun Jun  3 13:07:26 2012
New Revision: 715

Log:
- Unbreak on CURRENT after r236444

PR:		ports/163454
Submitted by:	Jan Beich <jbeich AT tormail.net>

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu May 31 21:11:52 2012	(r714)
+++ branches/experimental/Mk/bsd.gecko.mk	Sun Jun  3 13:07:26 2012	(r715)
@@ -811,6 +811,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' \

Modified: branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp	Thu May 31 21:11:52 2012	(r714)
+++ branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp	Sun Jun  3 13:07:26 2012	(r715)
@@ -1,11 +1,19 @@
---- xpcom/base/nsStackWalk.cpp.orig	2010-12-15 02:03:41.000000000 +0100
-+++ xpcom/base/nsStackWalk.cpp	2010-12-15 11:28:20.000000000 +0100
-@@ -1137,7 +1137,7 @@
- #define __USE_GNU
- #endif
+--- xpcom/base/nsStackWalk.cpp.orig	2012-05-29 00:57:31.000000000 +0200
++++ xpcom/base/nsStackWalk.cpp	2012-06-03 12:33:40.000000000 +0200
+@@ -57,7 +57,7 @@
+ };
+ static CriticalAddress gCriticalAddress;
  
 -#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
 +#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
  #include <dlfcn.h>
  #endif
  
+@@ -1155,6 +1155,7 @@
+ 
+ #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>
+