Sun Apr 20 23:07:55 2014 UTC ()
Fix PR pkg/48749. When pulseaudio option is not selected, disable
pulseaudio option explicitly.

Fix Linux build.


(ryoon)
diff -r1.19 -r1.20 pkgsrc/www/firefox/options.mk
cvs diff -r1.19 -r1.20 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2013/11/16 02:01:46 1.19
+++ pkgsrc/www/firefox/options.mk 2014/04/20 23:07:55 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.19 2013/11/16 02:01:46 ryoon Exp $ 1# $NetBSD: options.mk,v 1.20 2014/04/20 23:07:55 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4PKG_SUPPORTED_OPTIONS= official-mozilla-branding 4PKG_SUPPORTED_OPTIONS= official-mozilla-branding
5PKG_SUPPORTED_OPTIONS+= alsa debug mozilla-jemalloc gnome pulseaudio webrtc 5PKG_SUPPORTED_OPTIONS+= alsa debug mozilla-jemalloc gnome pulseaudio webrtc
6PLIST_VARS+= gnome jemalloc debug 6PLIST_VARS+= gnome jemalloc debug
7 7
8.if ${OPSYS} == "Linux" 8.if ${OPSYS} == "Linux"
9PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc 9PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc
10.else 10.else
11PKG_SUGGESTED_OPTIONS+= pulseaudio 11PKG_SUGGESTED_OPTIONS+= pulseaudio
12.endif 12.endif
13 13
14# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 14# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
@@ -48,26 +48,28 @@ CONFIGURE_ARGS+= --disable-jemalloc @@ -48,26 +48,28 @@ CONFIGURE_ARGS+= --disable-jemalloc
48.if !empty(PKG_OPTIONS:Mdebug) 48.if !empty(PKG_OPTIONS:Mdebug)
49CONFIGURE_ARGS+= --enable-debug="-g -O0" --enable-debug-symbols --disable-optimize 49CONFIGURE_ARGS+= --enable-debug="-g -O0" --enable-debug-symbols --disable-optimize
50CONFIGURE_ARGS+= --disable-install-strip 50CONFIGURE_ARGS+= --disable-install-strip
51PLIST.debug= yes 51PLIST.debug= yes
52.else 52.else
53CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols 53CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
54CONFIGURE_ARGS+= --enable-install-strip 54CONFIGURE_ARGS+= --enable-install-strip
55CONFIGURE_ARGS+= --enable-optimize=-O2  55CONFIGURE_ARGS+= --enable-optimize=-O2
56.endif 56.endif
57 57
58.if !empty(PKG_OPTIONS:Mpulseaudio) 58.if !empty(PKG_OPTIONS:Mpulseaudio)
59.include "../../audio/pulseaudio/buildlink3.mk" 59.include "../../audio/pulseaudio/buildlink3.mk"
60CONFIGURE_ARGS+= --enable-pulseaudio 60CONFIGURE_ARGS+= --enable-pulseaudio
 61.else
 62CONFIGURE_ARGS+= --disable-pulseaudio
61.endif 63.endif
62# XXX end 64# XXX end
63 65
64PLIST_VARS+= branding nobranding 66PLIST_VARS+= branding nobranding
65.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 67.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
66CONFIGURE_ARGS+= --enable-official-branding 68CONFIGURE_ARGS+= --enable-official-branding
67LICENSE= mozilla-trademark-license 69LICENSE= mozilla-trademark-license
68RESTRICTED= Trademark holder prohibits distribution of modified versions. 70RESTRICTED= Trademark holder prohibits distribution of modified versions.
69NO_BIN_ON_CDROM= ${RESTRICTED} 71NO_BIN_ON_CDROM= ${RESTRICTED}
70NO_BIN_ON_FTP= ${RESTRICTED} 72NO_BIN_ON_FTP= ${RESTRICTED}
71PLIST.branding= yes 73PLIST.branding= yes
72.else 74.else
73PLIST.nobranding= yes 75PLIST.nobranding= yes