Date: Thu, 23 Oct 2014 19:48:09 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1741 - in trunk: Mk mail/thunderbird www/firefox www/firefox-esr www/firefox-nightly www/libxul www/seamonkey Message-ID: <201410231948.s9NJm9TJ062002@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Oct 23 19:48:08 2014
New Revision: 1741
Log:
drop non-objdir build support
Modified:
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird/Makefile
trunk/www/firefox-esr/Makefile
trunk/www/firefox-nightly/Makefile
trunk/www/firefox/Makefile
trunk/www/libxul/Makefile
trunk/www/seamonkey/Makefile
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/Mk/bsd.gecko.mk Thu Oct 23 19:48:08 2014 (r1741)
@@ -96,8 +96,14 @@
WRKSRC?= ${WRKDIR}/mozilla
PLISTF?= ${WRKDIR}/plist_files
+MOZ_OBJDIR?= ${WRKSRC}/obj-${CONFIGURE_TARGET}
+CONFIGURE_WRKSRC?=${MOZ_OBJDIR}
+BUILD_WRKSRC?= ${MOZ_OBJDIR}
+INSTALL_WRKSRC?=${MOZ_OBJDIR}
+
MOZ_PIS_DIR?= lib/${MOZILLA}/init.d
+CONFIGURE_SCRIPT?=../configure
PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in
MOZCONFIG?= ${WRKSRC}/.mozconfig
MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications
@@ -113,6 +119,7 @@
MOZ_EXPORT+= ${CONFIGURE_ENV} \
PERL="${PERL}"
MOZ_OPTIONS+= ${CONFIGURE_TARGET} --prefix="${PREFIX}"
+MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}"
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA}
@@ -450,17 +457,6 @@
MOZ_OPTIONS+= --disable-v1-string-abi
.endif
-.if defined(OBJDIR_BUILD)
-CONFIGURE_SCRIPT=../configure
-
-MOZ_OBJDIR= ${WRKSRC}/obj-${CONFIGURE_TARGET}
-CONFIGURE_WRKSRC=${MOZ_OBJDIR}
-BUILD_WRKSRC= ${MOZ_OBJDIR}
-INSTALL_WRKSRC= ${MOZ_OBJDIR}
-.else
-MOZ_OBJDIR= ${WRKSRC}
-.endif
-
.else # bsd.port.post.mk
pre-extract: gecko-pre-extract
@@ -569,9 +565,7 @@
pre-configure: gecko-pre-configure
gecko-pre-configure:
-.if defined(OBJDIR_BUILD)
${MKDIR} ${MOZ_OBJDIR}
-.endif
post-configure: gecko-post-configure
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/mail/thunderbird/Makefile Thu Oct 23 19:48:08 2014 (r1741)
@@ -35,7 +35,6 @@
L_VERSION= 3.3.2
SSP_UNSAFE= yes
-OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
USE_MOZILLA= # empty
Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/www/firefox-esr/Makefile Thu Oct 23 19:48:08 2014 (r1741)
@@ -31,7 +31,6 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
CPE_PRODUCT= ${PORTNAME}_esr
CONFLICTS= firefox-3[02-9].* firefox-2[0-35-9].*
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/www/firefox-nightly/Makefile Thu Oct 23 19:48:08 2014 (r1741)
@@ -35,7 +35,6 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
FETCH_ENV= SSL_CA_CERT_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
-OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
CPE_VERSION= ${PORTVERSION:R}
CPE_UPDATE= alpha1
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/www/firefox/Makefile Thu Oct 23 19:48:08 2014 (r1741)
@@ -31,7 +31,6 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
CONFLICTS= firefox-esr-31.* firefox-esr-24.* firefox-esr-17.*
MOZ_PKGCONFIG_FILES= # empty
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/www/libxul/Makefile Thu Oct 23 19:48:08 2014 (r1741)
@@ -48,7 +48,6 @@
MOZ_OPTIONS?= --enable-application=xulrunner
USE_GECKO= gecko
CPE_PRODUCT= firefox_esr
-OBJDIR_BUILD= # in-tree build broken after bug 789837
MOZILLA_EXEC_NAME=xulrunner
USE_MOZILLA= # empty
MOZILLA_PLIST_DIRS= bin include lib share/idl libdata
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Thu Oct 23 11:43:26 2014 (r1740)
+++ trunk/www/seamonkey/Makefile Thu Oct 23 19:48:08 2014 (r1741)
@@ -35,7 +35,6 @@
L_VERSION= 3.5
SSP_UNSAFE= yes
-OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
WANT_GNOME= yes
USE_QT5= # empty
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410231948.s9NJm9TJ062002>