diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-01-16 23:35:16 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-01-16 23:35:16 +0000 |
| commit | 14d9caa8162fa898a742b0d18aa5ffabba54666a (patch) | |
| tree | 31c59745dbd4c2b0bb60b495ecc84141913d2c86 /www/firefox | |
| parent | 3581eb2081ab759c2cd59f90c35688d76ce8dcdc (diff) | |
| download | pkgsrc-14d9caa8162fa898a742b0d18aa5ffabba54666a.tar.gz | |
Fix build problems on solaris reported in NetBSD PR/31481, PR/42905,
and PR/33583. See also https://bugzilla.mozilla.org/show_bug.cgi?id=77788
for a discussion of this.
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile.common | 6 | ||||
| -rw-r--r-- | www/firefox/distinfo | 4 | ||||
| -rw-r--r-- | www/firefox/patches/patch-ap | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index e37cdb8e431..aeba1fab84a 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2007/01/15 19:25:22 joerg Exp $ +# $NetBSD: Makefile.common,v 1.15 2007/01/16 23:35:16 dmcmahill Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -125,6 +125,10 @@ PLIST_SUBST+= SUNOSLIB="@comment " SCRIPTS_ENV+= SUNOSLIB="@comment " .endif +.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc" +MAKEFLAGS+= NS_USE_GCC=YES +.endif + SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} SCRIPTS_ENV+= SED=${SED:Q} diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 8121dfe5fcf..6a1ef6633ce 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.59 2006/12/20 11:01:26 ghen Exp $ +$NetBSD: distinfo,v 1.60 2007/01/16 23:35:16 dmcmahill Exp $ SHA1 (firefox-1.5.0.9-source.tar.bz2) = 55147ecf4882baf618d1e5eb5f5a438086706425 RMD160 (firefox-1.5.0.9-source.tar.bz2) = b83bca8f317a6bc00dd40fd0d868cbe82536f45e @@ -17,7 +17,7 @@ SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602 -SHA1 (patch-ap) = 0a99d04b6746cf85e73a3a9a1e6fed118495c6a5 +SHA1 (patch-ap) = 0380e884b579bf8bb596e88c1adc20fd764242e3 SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap index 40210afbd5d..04418743970 100644 --- a/www/firefox/patches/patch-ap +++ b/www/firefox/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.5 2005/12/10 13:47:22 taya Exp $ +$NetBSD: patch-ap,v 1.6 2007/01/16 23:35:16 dmcmahill Exp $ diff -ruN ../Orig/mozilla/security/coreconf/command.mk ./security/coreconf/command.mk --- ../Orig/mozilla/security/coreconf/command.mk 2004-04-26 00:02:17.000000000 +0900 @@ -8,7 +8,7 @@ diff -ruN ../Orig/mozilla/security/coreconf/command.mk ./security/coreconf/comma LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) NFSPWD = $(NSINSTALL_DIR)/nfspwd -CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ -+CFLAGS += $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ ++CFLAGS = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ $(XCFLAGS) RANLIB = echo TAR = /bin/tar |