[SVN-Commit] r818 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/libxul www/libxul19 www/seamonkey

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Sat Jun 30 22:54:48 UTC 2012 

Author: jbeich
Date: Sat Jun 30 22:54:41 2012
New Revision: 818

Log:
properly export variables to not upset client.mk builds

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird3/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox36/Makefile
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/libxul19/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/Mk/bsd.gecko.mk	Sat Jun 30 22:54:41 2012	(r818)
@@ -666,13 +666,13 @@
 USE_GNOME+=	pango
 USE_QT4+=	moc_build gui network opengl
 MOZ_OPTIONS+=	--with-qtdir= # pkg-config
-CONFIGURE_ENV+=	HOST_MOC="${MOC}" HOST_RCC="${FALSE}"
+MOZ_EXPORT+=	HOST_MOC="${MOC}" HOST_RCC="${FALSE}"
 .else # gtk2, cairo-gtk2
 USE_GNOME+=	gtk20
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CONFIGURE_ENV+=	MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
+MOZ_EXPORT+=	MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
 MOZ_OPTIONS+=	--enable-optimize
 .else
 MOZ_OPTIONS+=	--disable-optimize

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -70,7 +70,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/mail/thunderbird/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -70,7 +70,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/mail/thunderbird3/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -66,7 +66,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/firefox-esr/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -65,7 +65,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/firefox-nightly/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -73,15 +73,14 @@
 
 .if ${OSVERSION} > 1000011
 MOZ_OPTIONS+=	--enable-jemalloc
-CONFIGURE_ENV+=	MOZ_JEMALLOC=1
-MAKE_ENV+=	MOZ_JEMALLOC=1 # PGO configure
+MOZ_EXPORT+=	MOZ_JEMALLOC=1
 .endif
 
 .if ${ARCH} == powerpc64
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/firefox/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -65,7 +65,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/firefox36/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -61,7 +61,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/libxul/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -63,7 +63,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/libxul19/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -68,7 +68,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif
@@ -77,7 +77,7 @@
 USE_JAVA=	yes
 JAVA_VERSION+=	1.5+
 JAVA_OS+=	native
-CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
+MOZ_EXPORT+=	JAVA_HOME="${JAVA_HOME}"
 MOZ_OPTIONS+=	--enable-javaxpcom
 .else
 MOZ_OPTIONS+=	--disable-javaxpcom

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Sat Jun 30 22:54:30 2012	(r817)
+++ branches/experimental/www/seamonkey/Makefile	Sat Jun 30 22:54:41 2012	(r818)
@@ -36,7 +36,7 @@
 USE_GL=		gl
 MAKE_JOBS_SAFE=	yes
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
-MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
+MOZ_EXPORT=	LD_LIBRARY_PATH="${WRKSRC}/dist/bin"
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
@@ -70,7 +70,7 @@
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif

More information about the freebsd-gecko mailing list