CVS commit: pkgsrc/security/libgcrypt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 15:23:34 UTC 2025

Modified Files:
        pkgsrc/security/libgcrypt: Makefile

Log Message:
libgcrypt: Fix build with CFLAGS=-O.

>From Jonathan Perkin <jperkin%smartos.org@localhost>
via drecklypkg commit 09abbc83f335b454957237dd374e1ec17f5d3189


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/security/libgcrypt/Makefile

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

Modified files:

Index: pkgsrc/security/libgcrypt/Makefile
diff -u pkgsrc/security/libgcrypt/Makefile:1.114 pkgsrc/security/libgcrypt/Makefile:1.115
--- pkgsrc/security/libgcrypt/Makefile:1.114    Wed Nov  6 11:14:15 2024
+++ pkgsrc/security/libgcrypt/Makefile  Tue Feb 18 15:23:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2024/11/06 11:14:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.115 2025/02/18 15:23:33 wiz Exp $
 
 DISTNAME=      libgcrypt-1.11.0
 PKGREVISION=   2
@@ -23,6 +23,10 @@ INFO_FILES=          yes
 CFLAGS+=               -fheinous-gnu-extensions
 .endif
 
+# Parts of the code actively reject optimisation.  The configure script
+# strips out most flags but oddly does not handle -O so do it ourselves.
+CFLAGS:=               ${CFLAGS:C/^-O$//g}
+
 SUBST_CLASSES+=                rpath
 SUBST_FILES.rpath=     src/libgcrypt-config.in
 SUBST_STAGE.rpath=     pre-configure