[SVN-Commit] r1743 - in trunk: Mk www/firefox-nightly

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Oct 23 19:48:24 2014
New Revision: 1743

Log:
configure in a separate step

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-nightly/Makefile

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Thu Oct 23 19:48:17 2014	(r1742)
+++ trunk/Mk/bsd.gecko.mk	Thu Oct 23 19:48:24 2014	(r1743)
@@ -560,10 +560,14 @@
 	@${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz}
 .endfor
 
-pre-configure: gecko-pre-configure
+do-configure: gecko-do-configure
 
-gecko-pre-configure:
-	${MKDIR} ${MOZ_OBJDIR}
+gecko-do-configure:
+		@(if ! ${DO_MAKE_BUILD} configure; then \
+			 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
+			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+			 ${FALSE}; \
+		fi)
 
 post-configure: gecko-post-configure
 

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Thu Oct 23 19:48:17 2014	(r1742)
+++ trunk/www/firefox-nightly/Makefile	Thu Oct 23 19:48:24 2014	(r1743)
@@ -100,6 +100,10 @@
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 .else
+do-configure:
+	cd ${WRKSRC} && MOZBUILD_STATE_PATH=${WRKDIR} \
+		${MAKE_ENV} ${PYTHON_CMD} ${MOZSRC}/mach configure
+
 do-build:
 	cd ${WRKSRC} && MOZBUILD_STATE_PATH=${WRKDIR} \
 		${MAKE_ENV} ${PYTHON_CMD} ${MOZSRC}/mach build