[pkgsrc/trunk]: pkgsrc/www/firefox3 Load Makefile-firefox.common first, so th...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5cb9178a98d1
branches:  trunk
changeset: 553392:5cb9178a98d1
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Tue Jan 20 03:18:53 2009 +0000

description:
Load Makefile-firefox.common first, so that USE_LANGUAGES gets a chance to be
correctly set up before any other include has a chaance to make use of
compiler.mk.

Fixes build (if compiler.mk gets used) by avoiding the C++ compiler being
replaced by the fail wrapper.

diffstat:

 www/firefox3/Makefile |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r f51cea85b714 -r 5cb9178a98d1 www/firefox3/Makefile
--- a/www/firefox3/Makefile     Tue Jan 20 00:49:13 2009 +0000
+++ b/www/firefox3/Makefile     Tue Jan 20 03:18:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/12/27 16:11:45 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2009/01/20 03:18:53 dsainty Exp $
 
 MOZILLA=               firefox3        # allow coexisting with firefox2
 COMMENT=               Lightweight gecko-based web browser
@@ -14,11 +14,9 @@
 
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.6.4
 
-PYTHON_FOR_BUILD_ONLY= yes
-.include "../../lang/python/application.mk"
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
-
-# Pull in standard firefox build framework, and override some things below
+# Pull in standard firefox build framework, and override some things below.
+# This include must appear first, to ensure that USE_LANGUAGES is set
+# correctly before mk/compiler.mk may be loaded.
 .include "../../www/firefox/Makefile-firefox.common"
 
 MAINTAINER=            tnn%NetBSD.org@localhost
@@ -112,6 +110,10 @@
 # Avoids needing curl on Linux
 CONFIGURE_ARGS+=       --disable-crashreporter
 
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/application.mk"
+CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
+
 CONFIGURE_ARGS+=       --enable-system-sqlite
 .include "../../databases/sqlite3/buildlink3.mk"