[SVN-Commit] r383 - branches/experimental/www/firefox/files branches/experimental/www/firefox35/files trunk/www/firefox/files trunk/www/firefox35/files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Tue Aug 17 07:47:33 UTC 2010 

Author: beat
Date: Tue Aug 17 07:47:26 2010
New Revision: 383

Log:
- Unbreak with recent versions of GCC

PR:		ports/142736
Submitted by:	bf <bf1783 AT gmail.com>

Added:
   branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in
   branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
   branches/experimental/www/firefox35/files/patch-toolkit_library_Makefile.in
   branches/experimental/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp
   trunk/www/firefox/files/patch-toolkit_library_Makefile.in
   trunk/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
   trunk/www/firefox35/files/patch-toolkit_library_Makefile.in
   trunk/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp
Modified:
   branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
   trunk/www/firefox/files/patch-js_src_jsnum.cpp

Modified: branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp	Tue Aug 17 07:44:27 2010	(r382)
+++ branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp	Tue Aug 17 07:47:26 2010	(r383)
@@ -1,5 +1,5 @@
---- js/src/jsnum.cpp.orig	2009-10-14 18:03:30.000000000 +0200
-+++ js/src/jsnum.cpp	2009-10-15 21:49:44.000000000 +0200
+--- js/src/jsnum.cpp.orig	2010-01-05 22:35:17.000000000 -0500
++++ js/src/jsnum.cpp	2010-01-11 05:10:19.000000000 -0500
 @@ -43,6 +43,9 @@
  /*
   * JS number type and wrapper class.
@@ -10,14 +10,16 @@
  #ifdef XP_OS2
  #define _PC_53  PC_53
  #define _MCW_EM MCW_EM
-@@ -691,8 +694,16 @@
+@@ -691,8 +694,18 @@
  
  #else
  
 +#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if __BSD_VISIBLE == 0
++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
++#endif
 +#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
 +#else
 +
  #define FIX_FPU() ((void)0)

Added: branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- toolkit/library/Makefile.in.orig	2010-01-11 12:13:08.000000000 -0500
++++ toolkit/library/Makefile.in	2010-01-11 12:15:05.000000000 -0500
+@@ -181,7 +181,7 @@
+ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
+ 	$(INSTALL) $^ .
+ 
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+ include $(srcdir)/libxul-rules.mk

Added: branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- xpcom/base/nsStackWalk.cpp.orig	2010-01-11 02:11:49.000000000 -0500
++++ xpcom/base/nsStackWalk.cpp	2010-01-11 02:13:26.000000000 -0500
+@@ -1132,7 +1132,7 @@
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #endif
+ 

Added: branches/experimental/www/firefox35/files/patch-toolkit_library_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox35/files/patch-toolkit_library_Makefile.in	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- toolkit/library/Makefile.in.orig    2010-01-11 23:57:11.000000000 -0500
++++ toolkit/library/Makefile.in 2010-01-11 23:58:08.000000000 -0500
+@@ -181,7 +181,7 @@
+ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
+        $(INSTALL) $^ .
+ 
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+ include $(srcdir)/libxul-rules.mk

Added: branches/experimental/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- xpcom/base/nsStackWalk.cpp.orig     2010-01-11 23:06:47.000000000 -0500
++++ xpcom/base/nsStackWalk.cpp  2010-01-11 23:07:29.000000000 -0500
+@@ -1124,7 +1124,7 @@
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #endif
+ 

Modified: trunk/www/firefox/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/firefox/files/patch-js_src_jsnum.cpp	Tue Aug 17 07:44:27 2010	(r382)
+++ trunk/www/firefox/files/patch-js_src_jsnum.cpp	Tue Aug 17 07:47:26 2010	(r383)
@@ -1,5 +1,5 @@
---- js/src/jsnum.cpp.orig	2009-10-14 18:03:30.000000000 +0200
-+++ js/src/jsnum.cpp	2009-10-15 21:49:44.000000000 +0200
+--- js/src/jsnum.cpp.orig	2010-01-05 22:35:17.000000000 -0500
++++ js/src/jsnum.cpp	2010-01-11 05:10:19.000000000 -0500
 @@ -43,6 +43,9 @@
  /*
   * JS number type and wrapper class.
@@ -10,14 +10,16 @@
  #ifdef XP_OS2
  #define _PC_53  PC_53
  #define _MCW_EM MCW_EM
-@@ -691,8 +694,16 @@
+@@ -691,8 +694,18 @@
  
  #else
  
 +#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if __BSD_VISIBLE == 0
++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
++#endif
 +#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
 +#else
 +
  #define FIX_FPU() ((void)0)

Added: trunk/www/firefox/files/patch-toolkit_library_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-toolkit_library_Makefile.in	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- toolkit/library/Makefile.in.orig	2010-01-11 12:13:08.000000000 -0500
++++ toolkit/library/Makefile.in	2010-01-11 12:15:05.000000000 -0500
+@@ -181,7 +181,7 @@
+ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
+ 	$(INSTALL) $^ .
+ 
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+ include $(srcdir)/libxul-rules.mk

Added: trunk/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- xpcom/base/nsStackWalk.cpp.orig	2010-01-11 02:11:49.000000000 -0500
++++ xpcom/base/nsStackWalk.cpp	2010-01-11 02:13:26.000000000 -0500
+@@ -1132,7 +1132,7 @@
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #endif
+ 

Added: trunk/www/firefox35/files/patch-toolkit_library_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox35/files/patch-toolkit_library_Makefile.in	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- toolkit/library/Makefile.in.orig    2010-01-11 23:57:11.000000000 -0500
++++ toolkit/library/Makefile.in 2010-01-11 23:58:08.000000000 -0500
+@@ -181,7 +181,7 @@
+ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
+        $(INSTALL) $^ .
+ 
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+ include $(srcdir)/libxul-rules.mk

Added: trunk/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp	Tue Aug 17 07:47:26 2010	(r383)
@@ -0,0 +1,11 @@
+--- xpcom/base/nsStackWalk.cpp.orig     2010-01-11 23:06:47.000000000 -0500
++++ xpcom/base/nsStackWalk.cpp  2010-01-11 23:07:29.000000000 -0500
+@@ -1124,7 +1124,7 @@
+ #define __USE_GNU
+ #endif
+ 
+-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
++#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #endif
+

More information about the freebsd-gecko mailing list