CVS commit: pkgsrc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Nov 18 22:38:22 UTC 2020

Modified Files:
        pkgsrc/security/tor-browser: options.mk
        pkgsrc/www/firefox: options.mk
        pkgsrc/www/firefox68: options.mk
        pkgsrc/www/firefox78: options.mk

Log Message:
www/firefox*: Use -Og for debug option and -O2 for debug-info option.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/tor-browser/options.mk
cvs rdiff -u -r1.61 -r1.62 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/firefox68/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox78/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/options.mk
diff -u pkgsrc/security/tor-browser/options.mk:1.9 pkgsrc/security/tor-browser/options.mk:1.10
--- pkgsrc/security/tor-browser/options.mk:1.9  Thu Nov 12 22:24:20 2020
+++ pkgsrc/security/tor-browser/options.mk      Wed Nov 18 22:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2020/11/12 22:24:20 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2020/11/18 22:38:21 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tor-browser
 
@@ -32,14 +32,14 @@ CONFIGURE_ARGS+=    --disable-jemalloc
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug="-g -O0"
+CONFIGURE_ARGS+=       --enable-debug="-g -Og"
 CONFIGURE_ARGS+=       --disable-optimize
 CONFIGURE_ARGS+=       --enable-debug-js-modules
 CONFIGURE_ARGS+=       --disable-install-strip
 .else
 .  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
-CONFIGURE_ARGS+=       --enable-optimize=-Og
+CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --disable-install-strip
 .  else
 CONFIGURE_ARGS+=       --disable-debug-symbols

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.61 pkgsrc/www/firefox/options.mk:1.62
--- pkgsrc/www/firefox/options.mk:1.61  Wed Nov 11 10:11:21 2020
+++ pkgsrc/www/firefox/options.mk       Wed Nov 18 22:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.61 2020/11/11 10:11:21 nia Exp $
+# $NetBSD: options.mk,v 1.62 2020/11/18 22:38:21 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=      --disable-jemalloc
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug="-g -O0"
+CONFIGURE_ARGS+=       --enable-debug="-g -Og"
 CONFIGURE_ARGS+=       --disable-optimize
 CONFIGURE_ARGS+=       --enable-debug-js-modules
 CONFIGURE_ARGS+=       --disable-install-strip
@@ -42,7 +42,7 @@ PLIST.debug=          yes
 .else
 .  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
-CONFIGURE_ARGS+=       --enable-optimize=-Og
+CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --disable-install-strip
 .  else
 CONFIGURE_ARGS+=       --disable-debug-symbols

Index: pkgsrc/www/firefox68/options.mk
diff -u pkgsrc/www/firefox68/options.mk:1.11 pkgsrc/www/firefox68/options.mk:1.12
--- pkgsrc/www/firefox68/options.mk:1.11        Wed Nov 11 10:21:34 2020
+++ pkgsrc/www/firefox68/options.mk     Wed Nov 18 22:38:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2020/11/11 10:21:34 nia Exp $
+# $NetBSD: options.mk,v 1.12 2020/11/18 22:38:22 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -44,7 +44,7 @@ O0TRACKING=-fvar-tracking-assignments -f
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug="-g -O0 ${O0TRACKING}"
+CONFIGURE_ARGS+=       --enable-debug="-g -Og ${O0TRACKING}"
 CONFIGURE_ARGS+=       --disable-optimize
 CONFIGURE_ARGS+=       --enable-debug-js-modules
 CONFIGURE_ARGS+=       --disable-install-strip
@@ -52,7 +52,7 @@ PLIST.debug=          yes
 .else
 .  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
-CONFIGURE_ARGS+=       --enable-optimize=-Og
+CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --disable-install-strip
 .  else
 CONFIGURE_ARGS+=       --disable-debug-symbols

Index: pkgsrc/www/firefox78/options.mk
diff -u pkgsrc/www/firefox78/options.mk:1.2 pkgsrc/www/firefox78/options.mk:1.3
--- pkgsrc/www/firefox78/options.mk:1.2 Wed Nov 11 10:13:29 2020
+++ pkgsrc/www/firefox78/options.mk     Wed Nov 18 22:38:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/11/11 10:13:29 nia Exp $
+# $NetBSD: options.mk,v 1.3 2020/11/18 22:38:22 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=      --disable-jemalloc
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug="-g -O0"
+CONFIGURE_ARGS+=       --enable-debug="-g -Og"
 CONFIGURE_ARGS+=       --disable-optimize
 CONFIGURE_ARGS+=       --enable-debug-js-modules
 CONFIGURE_ARGS+=       --disable-install-strip
@@ -42,7 +42,7 @@ PLIST.debug=          yes
 .else
 .  if !empty(PKG_OPTIONS:Mdebug-info)
 CONFIGURE_ARGS+=       --enable-debug-symbols
-CONFIGURE_ARGS+=       --enable-optimize=-Og
+CONFIGURE_ARGS+=       --enable-optimize=-O2
 CONFIGURE_ARGS+=       --disable-install-strip
 .  else
 CONFIGURE_ARGS+=       --disable-debug-symbols