From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 01:55:37 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2AFBD37C for ; Mon, 14 Jan 2013 01:55:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 98271B5E for ; Mon, 14 Jan 2013 01:55:36 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0E1tZPx097895 for ; Mon, 14 Jan 2013 01:55:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0E1tUt5092380 for freebsd-gecko@freebsd.org; Mon, 14 Jan 2013 01:55:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 14 Jan 2013 01:55:30 GMT Message-Id: <201301140155.r0E1tUt5092380@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1142 - in trunk: . mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 01:55:37 -0000 Author: jbeich Date: Mon Jan 14 01:55:30 2013 New Revision: 1142 Log: de-support gcc42 following upstream since gecko18 Deleted: trunk/mail/thunderbird/files/patch-bug732340 trunk/mail/thunderbird/files/patch-bug783505 trunk/mail/thunderbird/files/patch-bug815025 trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h trunk/www/firefox-nightly/files/patch-bug732340 trunk/www/firefox-nightly/files/patch-bug783505 trunk/www/firefox-nightly/files/patch-bug815025 trunk/www/firefox-nightly/files/patch-content-base-src-nsTextFragmentImpl.h trunk/www/firefox/files/patch-bug732340 trunk/www/firefox/files/patch-bug783505 trunk/www/firefox/files/patch-bug815025 trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h trunk/www/seamonkey/files/patch-bug732340 trunk/www/seamonkey/files/patch-bug783505 trunk/www/seamonkey/files/patch-bug815025 trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h Modified: trunk/Gecko_ChangeLog trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in trunk/www/firefox/Makefile trunk/www/firefox/files/patch-ipc-chromium-Makefile.in trunk/www/seamonkey/Makefile trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/Gecko_ChangeLog Mon Jan 14 01:55:30 2013 (r1142) @@ -1 +1,2 @@ 19.0: +- make firefox/seamonkey use gcc47 when CXX is unset and "c++" isn't clang Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -68,6 +68,10 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi +.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 +USE_GCC?= 4.7+ +.endif + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile ============================================================================== --- trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -31,18 +31,6 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: --- mailnews/extensions/enigmail/ipc/src/Makefile.in~ +++ mailnews/extensions/enigmail/ipc/src/Makefile.in @@ -19,26 +19,26 @@ endif @@ -76,15 +64,3 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: Deleted: trunk/mail/thunderbird/files/patch-bug732340 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t - GPOS::position_finish (buffer); - } - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; -+#endif - - Deleted: trunk/mail/thunderbird/files/patch-bug783505 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git mozilla/js/src/jstypedarray.cpp mozilla/js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- mozilla/js/src/jstypedarray.cpp -+++ mozilla/js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- mozilla/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- mozilla/js/src/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/mail/thunderbird/files/patch-bug815025 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mozilla/mfbt/SHA1.h~ -+++ mozilla/mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/content/base/src/nsTextFragmentImpl.h -+++ mozilla/content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- mozilla/ipc/chromium/Makefile.in~ +++ mozilla/ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Deleted: trunk/www/firefox-nightly/files/patch-bug732340 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -496,3 +497,11 @@ hb_ot_layout_position_finish (hb_font_t - { - OT::GPOS::position_finish (font, buffer, zero_width_attached_marks); - } -+ -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int OT::SortedArrayOf >::search(unsigned int const &) const; -+template int OT::SortedArrayOf >::search(unsigned int const &) const; -+template int OT::SortedArrayOf >::search(unsigned int const &) const; -+template int OT::SortedArrayOf::search(unsigned int const &) const; -+#endif Deleted: trunk/www/firefox-nightly/files/patch-bug783505 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- js/src/jstypedarray.cpp -+++ js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- build/autoconf/gcc-pr39608.m4~ -+++ build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- js/src/build/autoconf/gcc-pr39608.m4~ -+++ js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/www/firefox-nightly/files/patch-bug815025 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mfbt/SHA1.h~ -+++ mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/www/firefox-nightly/files/patch-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/www/firefox-nightly/files/patch-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- content/base/src/nsTextFragmentImpl.h -+++ content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- ipc/chromium/Makefile.in~ +++ ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/firefox/Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -56,6 +56,10 @@ WRKSRC:= ${WRKDIR}/mozilla-beta +.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 +USE_GCC?= 4.7+ +.endif + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Deleted: trunk/www/firefox/files/patch-bug732340 ============================================================================== --- trunk/www/firefox/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t - GPOS::position_finish (buffer); - } - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; -+#endif - Deleted: trunk/www/firefox/files/patch-bug783505 ============================================================================== --- trunk/www/firefox/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- js/src/jstypedarray.cpp -+++ js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- build/autoconf/gcc-pr39608.m4~ -+++ build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- js/src/build/autoconf/gcc-pr39608.m4~ -+++ js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/www/firefox/files/patch-bug815025 ============================================================================== --- trunk/www/firefox/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mfbt/SHA1.h~ -+++ mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- content/base/src/nsTextFragmentImpl.h -+++ content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/www/firefox/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- ipc/chromium/Makefile.in~ +++ ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/seamonkey/Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -71,6 +71,10 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi +.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 +USE_GCC?= 4.7+ +.endif + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile ============================================================================== --- trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -31,18 +31,6 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: --- mailnews/extensions/enigmail/ipc/src/Makefile.in~ +++ mailnews/extensions/enigmail/ipc/src/Makefile.in @@ -19,26 +19,26 @@ endif @@ -76,15 +64,3 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: Deleted: trunk/www/seamonkey/files/patch-bug732340 ============================================================================== --- trunk/www/seamonkey/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t - GPOS::position_finish (buffer); - } - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; -+#endif - - Deleted: trunk/www/seamonkey/files/patch-bug783505 ============================================================================== --- trunk/www/seamonkey/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git mozilla/js/src/jstypedarray.cpp mozilla/js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- mozilla/js/src/jstypedarray.cpp -+++ mozilla/js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- mozilla/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- mozilla/js/src/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/www/seamonkey/files/patch-bug815025 ============================================================================== --- trunk/www/seamonkey/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mozilla/mfbt/SHA1.h~ -+++ mozilla/mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/content/base/src/nsTextFragmentImpl.h -+++ mozilla/content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- mozilla/ipc/chromium/Makefile.in~ +++ mozilla/ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL)