diff options
| author | martin <martin> | 2013-08-29 18:48:25 +0000 |
|---|---|---|
| committer | martin <martin> | 2013-08-29 18:48:25 +0000 |
| commit | 0ac565706a9cb1cbc642fb753d77d3e5a533708d (patch) | |
| tree | 3af462b5ae46e54cac452f25839fe69232199506 /www/firefox | |
| parent | 87d01ec2b4bf083d6926a408180e26fc7a110926 (diff) | |
| download | pkgsrc-0ac565706a9cb1cbc642fb753d77d3e5a533708d.tar.gz | |
Conditionalize the last remaining PLIST difference on sparc64
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/PLIST | 4 | ||||
| -rw-r--r-- | www/firefox/mozilla-common.mk | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 0af99386688..65f96e947cb 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.69 2013/08/29 14:14:34 martin Exp $ +@comment $NetBSD: PLIST,v 1.70 2013/08/29 18:48:25 martin Exp $ bin/firefox include/firefox/AbstractMediaDecoder.h include/firefox/AccEvent.h @@ -1303,7 +1303,7 @@ include/firefox/mozilla/storage/StatementCache.h include/firefox/mozilla/storage/Variant.h include/firefox/mozilla/storage/Variant_inl.h include/firefox/mozilla/threads/nsThreadIDs.h -include/firefox/mozilla/throw_gcc.h +${PLIST.throwwrapper}include/firefox/mozilla/throw_gcc.h include/firefox/mozilla/unused.h include/firefox/mozpngconf.h include/firefox/necko-config.h diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index cb90556af23..29a1f2a87fd 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.12 2013/08/29 14:14:34 martin Exp $ +# $NetBSD: mozilla-common.mk,v 1.13 2013/08/29 18:48:25 martin Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -98,12 +98,19 @@ SUBST_MESSAGE.python= Fixing path to python. SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},' -PLIST_VARS+= sps vorbis tremor glskia +PLIST_VARS+= sps vorbis tremor glskia throwwrapper .if ${MACHINE_ENDIAN} == "1234" PLIST.glskia= yes .endif +.if ${MACHINE_ARCH} != "sparc64" +# For some reasons the configure test for GCC bug 26905 still triggers on +# sparc64, which makes mozilla skip the installation of a few wrapper headers. +# Other archs end up with one additional file in the SDK headers +PLIST.throwwrapper= yes +.endif + .if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) PLIST.sps= yes .endif |