diff options
| author | dsainty <dsainty> | 2009-01-20 03:18:53 +0000 |
|---|---|---|
| committer | dsainty <dsainty> | 2009-01-20 03:18:53 +0000 |
| commit | ecbf7e3a0e2648803c29fd3e12d694ce0d0fdf35 (patch) | |
| tree | 723d7433c389fd68d87806807628381e33458b15 /www/firefox3 | |
| parent | 0959c344264d4aee6926b3eed7688a67a9794268 (diff) | |
| download | pkgsrc-ecbf7e3a0e2648803c29fd3e12d694ce0d0fdf35.tar.gz | |
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 (limited to 'www/firefox3')
| -rw-r--r-- | www/firefox3/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile index 9d0e3a02c89..762960a8389 100644 --- a/www/firefox3/Makefile +++ b/www/firefox3/Makefile @@ -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 @@ CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh 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 @@ -112,6 +110,10 @@ CONFIGURE_ARGS+= --disable-dbus # 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" |