[pkgsrc/trunk]: pkgsrc/security/libgcrypt Fix usage of -O and -Oz compiling o...

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7a0a16c1a9c
branches:  trunk
changeset: 385468:a7a0a16c1a9c
user:      nros <nros%pkgsrc.org@localhost>
date:      Sun Sep 18 08:42:45 2022 +0000

description:
Fix usage of -O and -Oz compiling options

The sed options that clear out optimization
options for rndjent.c, that must be compiled
without optimization, did not take away -O
as reported by Jason Bacon on pkgsrc-users.
While here also make it take away the -Oz
optimization option supported by gcc 12
and later.

diffstat:

 security/libgcrypt/distinfo                         |   3 ++-
 security/libgcrypt/patches/patch-random_Makefile.in |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r a3cf92b4039a -r a7a0a16c1a9c security/libgcrypt/distinfo
--- a/security/libgcrypt/distinfo       Sun Sep 18 08:25:48 2022 +0000
+++ b/security/libgcrypt/distinfo       Sun Sep 18 08:42:45 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2022/03/29 07:16:00 adam Exp $
+$NetBSD: distinfo,v 1.96 2022/09/18 08:42:45 nros Exp $
 
 BLAKE2s (libgcrypt-1.10.1.tar.bz2) = 9c70b204486365abb3b4731e14078d284952df672215d72f9d0ac6b508f82a8d
 SHA512 (libgcrypt-1.10.1.tar.bz2) = e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
@@ -7,4 +7,5 @@
 SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
 SHA1 (patch-configure) = edc92453a0843ab0442da7f1b9df2ef4c219bdf5
 SHA1 (patch-mpi_config.links) = 0e87480ead46914653405bb9c693554180ccd126
+SHA1 (patch-random_Makefile.in) = c72c5bcd2e0d5eee9c14b1ee04a683bc9ccec958
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518
diff -r a3cf92b4039a -r a7a0a16c1a9c security/libgcrypt/patches/patch-random_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgcrypt/patches/patch-random_Makefile.in       Sun Sep 18 08:42:45 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-random_Makefile.in,v 1.1 2022/09/18 08:42:45 nros Exp $
+
+* Support removal of -O and -Oz compiler options
+
+--- random/Makefile.in.orig    2022-09-18 07:52:40.446196827 +0000
++++ random/Makefile.in
+@@ -409,7 +409,7 @@ jitterentropy-base.c jitterentropy.h jit
+ @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat
+ 
+ # The rndjent module needs to be compiled without optimization.  */
+-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([1-9sg][1-9sg]*\)/-O0/g' -e 's/-Ofast/-O0/g'
++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([1-9sgz][1-9sgz]*\)/-O0/g' -e 's/-Ofast/-O0/g' -e 's/-O /-O0 /g'
+ all: all-am
+ 
+ .SUFFIXES: