[SVN-Commit] r747 - in branches/experimental: Mk www/firefox www/firefox-beta www/firefox-esr www/firefox-nightly www/firefox36

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Jun 11 20:55:34 2012
New Revision: 747

Log:
reduce redundancy in CFLAGS

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox36/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Mon Jun 11 20:54:57 2012	(r746)
+++ branches/experimental/Mk/bsd.gecko.mk	Mon Jun 11 20:55:34 2012	(r747)
@@ -676,12 +676,10 @@
 			PERL=${PERL}
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-MOZ_OPTIONS+=	--enable-optimize=${WITH_OPTIMIZE}
-CFLAGS:=	${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS}
-WITH_OPTIMIZE?=	-O2
+CONFIGURE_ENV+=	MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
+MOZ_OPTIONS+=	--enable-optimize
 .else
 MOZ_OPTIONS+=	--disable-optimize
-CFLAGS:=	${CFLAGS} ${EXTRA_CFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Mon Jun 11 20:54:57 2012	(r746)
+++ branches/experimental/www/firefox-beta/Makefile	Mon Jun 11 20:55:34 2012	(r747)
@@ -36,7 +36,6 @@
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Mon Jun 11 20:54:57 2012	(r746)
+++ branches/experimental/www/firefox-esr/Makefile	Mon Jun 11 20:55:34 2012	(r747)
@@ -37,7 +37,6 @@
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Mon Jun 11 20:54:57 2012	(r746)
+++ branches/experimental/www/firefox-nightly/Makefile	Mon Jun 11 20:55:34 2012	(r747)
@@ -41,7 +41,6 @@
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Mon Jun 11 20:54:57 2012	(r746)
+++ branches/experimental/www/firefox/Makefile	Mon Jun 11 20:55:34 2012	(r747)
@@ -36,7 +36,6 @@
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile	Mon Jun 11 20:54:57 2012	(r746)
+++ branches/experimental/www/firefox36/Makefile	Mon Jun 11 20:55:34 2012	(r747)
@@ -34,7 +34,6 @@
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes