24766288 thunderbird should build with latest GCC in CBE
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 30 Sep 2016 18:15:48 -0500
changeset 7015 47aaa6f8ec6e
parent 7014 d235420e6063
child 7016 401dd746ea8d
24766288 thunderbird should build with latest GCC in CBE
components/desktop/thunderbird/Makefile
components/desktop/thunderbird/patches/firefox-50-arc4random.patch
--- a/components/desktop/thunderbird/Makefile	Fri Sep 30 18:17:26 2016 -0500
+++ b/components/desktop/thunderbird/Makefile	Fri Sep 30 18:15:48 2016 -0500
@@ -30,8 +30,6 @@
 COMPILER = gcc
 
 include ../../../make-rules/shared-macros.mk
-GCC_ROOT = /usr/gcc/4.8
-
 
 COMPONENT_NAME=		thunderbird
 COMPONENT_VERSION=	45.1.0
@@ -94,8 +92,8 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
-# /usr/sbin needed for dtrace.
-PATH =         $(dirname $(CC)):/usr/gnu/bin:/usr/bin:/usr/sbin
+# /usr/sbin for dtrace, SPRO for python modules, PERL as well.
+PATH = $(dirname $(CC)):/usr/gnu/bin:/usr/bin:/usr/sbin:$(dirname $(PERL)):$(SPRO_VROOT)/bin
 
 MOZCONFIG =	$(BUILD_DIR_32)/mozconfig
 
@@ -120,8 +118,6 @@
 	echo "ac_add_options --disable-updater" >> $(MOZCONFIG) ; \
 	echo "ac_add_options --enable-update-packaging" >> $(MOZCONFIG) ; \
 	echo "ac_add_options --enable-ipc" >> $(MOZCONFIG) ; \
-	echo "ac_add_options --with-system-zlib" >> $(MOZCONFIG) ; \
-	echo "ac_add_options --with-system-bz2" >> $(MOZCONFIG) ; \
 	echo "ac_add_options --enable-gstreamer" >> $(MOZCONFIG) ; \
 	echo "ac_add_options --enable-system-pixman" >> $(MOZCONFIG) ; \
 	echo "ac_add_options --without-intl-api" >> $(MOZCONFIG) ; \
@@ -135,6 +131,11 @@
 CC +=		$(CC_BITS)
 CXX +=		$(CC_BITS)
 
+# jemalloc (from libxul) interposes on malloc in glib causing startup problems,
+# so use the big hammer for now, pending the resolution of:
+#    24765609 thunderbird build dies with newer GCC 
+LD_EXEC_OPTIONS += -z now
+
 CONFIGURE_ENV +=	PKG_CONFIG_PATH=$(CONFIGURE_LIBDIR.$(BITS))/pkgconfig
 CONFIGURE_ENV +=	OS_DEFINES="-D__USE_LEGACY_PROTOTYPES__"
 # -L.../dist/bin needs to be set otherwise it will report missing libnss3.so, 
--- a/components/desktop/thunderbird/patches/firefox-50-arc4random.patch	Fri Sep 30 18:17:26 2016 -0500
+++ b/components/desktop/thunderbird/patches/firefox-50-arc4random.patch	Fri Sep 30 18:15:48 2016 -0500
@@ -1,4 +1,4 @@
-ARC4RANDOM_EXPORT is defined as extern. Fixes issues in arc4random and libevent. 
+ARC4RANDOM_EXPORT is defined as extern. Fixes issues in arc4random and libevent.
 Solaris specific changes, will not send upstream.
 
 --- a/ipc/chromium/src/third_party/libevent/arc4random.c    2016-03-01 09:29:36.602447178 -0800
@@ -55,23 +55,6 @@
  #endif
  #endif
  #include <limits.h>
-diff a/ipc/app/moz.build b/ipc/app/moz.build
---- a/ipc/app/moz.build 2015-11-03 11:34:14.000000000 +0100
-+++ b/ipc/app/moz.build 2015-11-10 08:31:42.024431000 +0100
[email protected]@ -130,5 +130,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
-         'utils',
-     ]
-
-+OS_LIBS += [
-+    '$(DEPTH)/security/nss/lib/util/libnssutil3.so',
-+    '$(DEPTH)/security/nss/lib/ssl/libssl3.so',
-+    '$(DEPTH)/security/nss/lib/smime/libsmime3.so',
-+    '$(DEPTH)/security/nss/lib/nss/libnss3.so',
-+    '$(DEPTH)/config/external/lgpllibs/liblgpllibs.so',
-+    '-lsendfile',
-+]
- if CONFIG['GNU_CXX']:
-     CXXFLAGS += ['-Wshadow']
 --- a/ipc/chromium/moz.build	2016-03-28 13:41:06.878922929 -0700
 +++ b/ipc/chromium/moz.build	2016-03-28 13:42:04.555448660 -0700
 @@ -161,6 +161,23 @@ if os_bsd or os_linux: