Wed Nov 18 22:38:22 2020 UTC ()
www/firefox*: Use -Og for debug option and -O2 for debug-info option.


(riastradh)
diff -r1.9 -r1.10 pkgsrc/security/tor-browser/options.mk
diff -r1.61 -r1.62 pkgsrc/www/firefox/options.mk
diff -r1.11 -r1.12 pkgsrc/www/firefox68/options.mk
diff -r1.2 -r1.3 pkgsrc/www/firefox78/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/security/tor-browser/options.mk (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/options.mk 2020/11/12 22:24:20 1.9
+++ pkgsrc/security/tor-browser/options.mk 2020/11/18 22:38:21 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2020/11/12 22:24:20 wiz Exp $ 1# $NetBSD: options.mk,v 1.10 2020/11/18 22:38:21 riastradh Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tor-browser 3PKG_OPTIONS_VAR= PKG_OPTIONS.tor-browser
4 4
5PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 5PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
6PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus 6PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
7 7
8.if ${OPSYS} == "Linux" 8.if ${OPSYS} == "Linux"
9PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 9PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
10.else 10.else
11PKG_SUGGESTED_OPTIONS+= dbus 11PKG_SUGGESTED_OPTIONS+= dbus
12.endif 12.endif
13 13
14.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 14.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
@@ -22,34 +22,34 @@ CONFIGURE_ARGS+= --enable-alsa @@ -22,34 +22,34 @@ CONFIGURE_ARGS+= --enable-alsa
22.include "../../audio/alsa-lib/buildlink3.mk" 22.include "../../audio/alsa-lib/buildlink3.mk"
23.else 23.else
24CONFIGURE_ARGS+= --disable-alsa 24CONFIGURE_ARGS+= --disable-alsa
25.endif 25.endif
26 26
27.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 27.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
28CONFIGURE_ARGS+= --enable-jemalloc 28CONFIGURE_ARGS+= --enable-jemalloc
29CONFIGURE_ARGS+= --enable-replace-malloc 29CONFIGURE_ARGS+= --enable-replace-malloc
30.else 30.else
31CONFIGURE_ARGS+= --disable-jemalloc 31CONFIGURE_ARGS+= --disable-jemalloc
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mdebug) 34.if !empty(PKG_OPTIONS:Mdebug)
35CONFIGURE_ARGS+= --enable-debug="-g -O0" 35CONFIGURE_ARGS+= --enable-debug="-g -Og"
36CONFIGURE_ARGS+= --disable-optimize 36CONFIGURE_ARGS+= --disable-optimize
37CONFIGURE_ARGS+= --enable-debug-js-modules 37CONFIGURE_ARGS+= --enable-debug-js-modules
38CONFIGURE_ARGS+= --disable-install-strip 38CONFIGURE_ARGS+= --disable-install-strip
39.else 39.else
40. if !empty(PKG_OPTIONS:Mdebug-info) 40. if !empty(PKG_OPTIONS:Mdebug-info)
41CONFIGURE_ARGS+= --enable-debug-symbols 41CONFIGURE_ARGS+= --enable-debug-symbols
42CONFIGURE_ARGS+= --enable-optimize=-Og 42CONFIGURE_ARGS+= --enable-optimize=-O2
43CONFIGURE_ARGS+= --disable-install-strip 43CONFIGURE_ARGS+= --disable-install-strip
44. else 44. else
45CONFIGURE_ARGS+= --disable-debug-symbols 45CONFIGURE_ARGS+= --disable-debug-symbols
46CONFIGURE_ARGS+= --enable-optimize=-O2 46CONFIGURE_ARGS+= --enable-optimize=-O2
47CONFIGURE_ARGS+= --enable-install-strip 47CONFIGURE_ARGS+= --enable-install-strip
48. endif 48. endif
49CONFIGURE_ARGS+= --disable-debug 49CONFIGURE_ARGS+= --disable-debug
50.endif 50.endif
51 51
52.if !empty(PKG_OPTIONS:Mpulseaudio) 52.if !empty(PKG_OPTIONS:Mpulseaudio)
53.include "../../audio/pulseaudio/buildlink3.mk" 53.include "../../audio/pulseaudio/buildlink3.mk"
54CONFIGURE_ARGS+= --enable-pulseaudio 54CONFIGURE_ARGS+= --enable-pulseaudio
55.else 55.else
cvs diff -r1.61 -r1.62 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2020/11/11 10:11:21 1.61
+++ pkgsrc/www/firefox/options.mk 2020/11/18 22:38:21 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.61 2020/11/11 10:11:21 nia Exp $ 1# $NetBSD: options.mk,v 1.62 2020/11/18 22:38:21 riastradh Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
8PLIST_VARS+= debug 8PLIST_VARS+= debug
9 9
10.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= dbus 13PKG_SUGGESTED_OPTIONS+= dbus
14.endif 14.endif
@@ -24,35 +24,35 @@ CONFIGURE_ARGS+= --enable-alsa @@ -24,35 +24,35 @@ CONFIGURE_ARGS+= --enable-alsa
24.include "../../audio/alsa-lib/buildlink3.mk" 24.include "../../audio/alsa-lib/buildlink3.mk"
25.else 25.else
26CONFIGURE_ARGS+= --disable-alsa 26CONFIGURE_ARGS+= --disable-alsa
27.endif 27.endif
28 28
29.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 29.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
30CONFIGURE_ARGS+= --enable-jemalloc 30CONFIGURE_ARGS+= --enable-jemalloc
31CONFIGURE_ARGS+= --enable-replace-malloc 31CONFIGURE_ARGS+= --enable-replace-malloc
32.else 32.else
33CONFIGURE_ARGS+= --disable-jemalloc 33CONFIGURE_ARGS+= --disable-jemalloc
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Mdebug) 36.if !empty(PKG_OPTIONS:Mdebug)
37CONFIGURE_ARGS+= --enable-debug="-g -O0" 37CONFIGURE_ARGS+= --enable-debug="-g -Og"
38CONFIGURE_ARGS+= --disable-optimize 38CONFIGURE_ARGS+= --disable-optimize
39CONFIGURE_ARGS+= --enable-debug-js-modules 39CONFIGURE_ARGS+= --enable-debug-js-modules
40CONFIGURE_ARGS+= --disable-install-strip 40CONFIGURE_ARGS+= --disable-install-strip
41PLIST.debug= yes 41PLIST.debug= yes
42.else 42.else
43. if !empty(PKG_OPTIONS:Mdebug-info) 43. if !empty(PKG_OPTIONS:Mdebug-info)
44CONFIGURE_ARGS+= --enable-debug-symbols 44CONFIGURE_ARGS+= --enable-debug-symbols
45CONFIGURE_ARGS+= --enable-optimize=-Og 45CONFIGURE_ARGS+= --enable-optimize=-O2
46CONFIGURE_ARGS+= --disable-install-strip 46CONFIGURE_ARGS+= --disable-install-strip
47. else 47. else
48CONFIGURE_ARGS+= --disable-debug-symbols 48CONFIGURE_ARGS+= --disable-debug-symbols
49CONFIGURE_ARGS+= --enable-optimize=-O2 49CONFIGURE_ARGS+= --enable-optimize=-O2
50CONFIGURE_ARGS+= --enable-install-strip 50CONFIGURE_ARGS+= --enable-install-strip
51. endif 51. endif
52CONFIGURE_ARGS+= --disable-debug 52CONFIGURE_ARGS+= --disable-debug
53.endif 53.endif
54 54
55.if !empty(PKG_OPTIONS:Mpulseaudio) 55.if !empty(PKG_OPTIONS:Mpulseaudio)
56.include "../../audio/pulseaudio/buildlink3.mk" 56.include "../../audio/pulseaudio/buildlink3.mk"
57CONFIGURE_ARGS+= --enable-pulseaudio 57CONFIGURE_ARGS+= --enable-pulseaudio
58.else 58.else
cvs diff -r1.11 -r1.12 pkgsrc/www/firefox68/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/options.mk 2020/11/11 10:21:34 1.11
+++ pkgsrc/www/firefox68/Attic/options.mk 2020/11/18 22:38:22 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.11 2020/11/11 10:21:34 nia Exp $ 1# $NetBSD: options.mk,v 1.12 2020/11/18 22:38:22 riastradh Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
8PLIST_VARS+= debug 8PLIST_VARS+= debug
9 9
10.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= dbus 13PKG_SUGGESTED_OPTIONS+= dbus
14.endif 14.endif
@@ -34,35 +34,35 @@ CONFIGURE_ARGS+= --disable-jemalloc @@ -34,35 +34,35 @@ CONFIGURE_ARGS+= --disable-jemalloc
34.endif 34.endif
35 35
36.include "../../mk/compiler.mk" 36.include "../../mk/compiler.mk"
37.if !empty(PKGSRC_COMPILER:Mgcc) 37.if !empty(PKGSRC_COMPILER:Mgcc)
38. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480 38. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
39# Modern gcc does not run any "tracking" passes when compiling with -O0, 39# Modern gcc does not run any "tracking" passes when compiling with -O0,
40# which makes the generated debug info mostly useless. So explicitly 40# which makes the generated debug info mostly useless. So explicitly
41# request them. 41# request them.
42O0TRACKING=-fvar-tracking-assignments -fvar-tracking 42O0TRACKING=-fvar-tracking-assignments -fvar-tracking
43. endif 43. endif
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mdebug) 46.if !empty(PKG_OPTIONS:Mdebug)
47CONFIGURE_ARGS+= --enable-debug="-g -O0 ${O0TRACKING}" 47CONFIGURE_ARGS+= --enable-debug="-g -Og ${O0TRACKING}"
48CONFIGURE_ARGS+= --disable-optimize 48CONFIGURE_ARGS+= --disable-optimize
49CONFIGURE_ARGS+= --enable-debug-js-modules 49CONFIGURE_ARGS+= --enable-debug-js-modules
50CONFIGURE_ARGS+= --disable-install-strip 50CONFIGURE_ARGS+= --disable-install-strip
51PLIST.debug= yes 51PLIST.debug= yes
52.else 52.else
53. if !empty(PKG_OPTIONS:Mdebug-info) 53. if !empty(PKG_OPTIONS:Mdebug-info)
54CONFIGURE_ARGS+= --enable-debug-symbols 54CONFIGURE_ARGS+= --enable-debug-symbols
55CONFIGURE_ARGS+= --enable-optimize=-Og 55CONFIGURE_ARGS+= --enable-optimize=-O2
56CONFIGURE_ARGS+= --disable-install-strip 56CONFIGURE_ARGS+= --disable-install-strip
57. else 57. else
58CONFIGURE_ARGS+= --disable-debug-symbols 58CONFIGURE_ARGS+= --disable-debug-symbols
59CONFIGURE_ARGS+= --enable-optimize=-O2 59CONFIGURE_ARGS+= --enable-optimize=-O2
60CONFIGURE_ARGS+= --enable-install-strip 60CONFIGURE_ARGS+= --enable-install-strip
61. endif 61. endif
62CONFIGURE_ARGS+= --disable-debug 62CONFIGURE_ARGS+= --disable-debug
63.endif 63.endif
64 64
65.if !empty(PKG_OPTIONS:Mpulseaudio) 65.if !empty(PKG_OPTIONS:Mpulseaudio)
66.include "../../audio/pulseaudio/buildlink3.mk" 66.include "../../audio/pulseaudio/buildlink3.mk"
67CONFIGURE_ARGS+= --enable-pulseaudio 67CONFIGURE_ARGS+= --enable-pulseaudio
68.else 68.else
cvs diff -r1.2 -r1.3 pkgsrc/www/firefox78/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/options.mk 2020/11/11 10:13:29 1.2
+++ pkgsrc/www/firefox78/Attic/options.mk 2020/11/18 22:38:22 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2020/11/11 10:13:29 nia Exp $ 1# $NetBSD: options.mk,v 1.3 2020/11/18 22:38:22 riastradh Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
8PLIST_VARS+= debug 8PLIST_VARS+= debug
9 9
10.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= dbus 13PKG_SUGGESTED_OPTIONS+= dbus
14.endif 14.endif
@@ -24,35 +24,35 @@ CONFIGURE_ARGS+= --enable-alsa @@ -24,35 +24,35 @@ CONFIGURE_ARGS+= --enable-alsa
24.include "../../audio/alsa-lib/buildlink3.mk" 24.include "../../audio/alsa-lib/buildlink3.mk"
25.else 25.else
26CONFIGURE_ARGS+= --disable-alsa 26CONFIGURE_ARGS+= --disable-alsa
27.endif 27.endif
28 28
29.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 29.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
30CONFIGURE_ARGS+= --enable-jemalloc 30CONFIGURE_ARGS+= --enable-jemalloc
31CONFIGURE_ARGS+= --enable-replace-malloc 31CONFIGURE_ARGS+= --enable-replace-malloc
32.else 32.else
33CONFIGURE_ARGS+= --disable-jemalloc 33CONFIGURE_ARGS+= --disable-jemalloc
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Mdebug) 36.if !empty(PKG_OPTIONS:Mdebug)
37CONFIGURE_ARGS+= --enable-debug="-g -O0" 37CONFIGURE_ARGS+= --enable-debug="-g -Og"
38CONFIGURE_ARGS+= --disable-optimize 38CONFIGURE_ARGS+= --disable-optimize
39CONFIGURE_ARGS+= --enable-debug-js-modules 39CONFIGURE_ARGS+= --enable-debug-js-modules
40CONFIGURE_ARGS+= --disable-install-strip 40CONFIGURE_ARGS+= --disable-install-strip
41PLIST.debug= yes 41PLIST.debug= yes
42.else 42.else
43. if !empty(PKG_OPTIONS:Mdebug-info) 43. if !empty(PKG_OPTIONS:Mdebug-info)
44CONFIGURE_ARGS+= --enable-debug-symbols 44CONFIGURE_ARGS+= --enable-debug-symbols
45CONFIGURE_ARGS+= --enable-optimize=-Og 45CONFIGURE_ARGS+= --enable-optimize=-O2
46CONFIGURE_ARGS+= --disable-install-strip 46CONFIGURE_ARGS+= --disable-install-strip
47. else 47. else
48CONFIGURE_ARGS+= --disable-debug-symbols 48CONFIGURE_ARGS+= --disable-debug-symbols
49CONFIGURE_ARGS+= --enable-optimize=-O2 49CONFIGURE_ARGS+= --enable-optimize=-O2
50CONFIGURE_ARGS+= --enable-install-strip 50CONFIGURE_ARGS+= --enable-install-strip
51. endif 51. endif
52CONFIGURE_ARGS+= --disable-debug 52CONFIGURE_ARGS+= --disable-debug
53.endif 53.endif
54 54
55.if !empty(PKG_OPTIONS:Mpulseaudio) 55.if !empty(PKG_OPTIONS:Mpulseaudio)
56.include "../../audio/pulseaudio/buildlink3.mk" 56.include "../../audio/pulseaudio/buildlink3.mk"
57CONFIGURE_ARGS+= --enable-pulseaudio 57CONFIGURE_ARGS+= --enable-pulseaudio
58.else 58.else