git: a2ed083c8a7d - main - dns/dnsmasq*: don't force -O2 into CFLAGS

From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Tue, 16 Sep 2025 17:23:54 UTC
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a2ed083c8a7d265ad4ffc2acbbc12eb22e19b6a9

commit a2ed083c8a7d265ad4ffc2acbbc12eb22e19b6a9
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-09-16 17:22:52 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-09-16 17:23:43 +0000

    dns/dnsmasq*: don't force -O2 into CFLAGS
    
    Reported by:    diizzy@
    MFH:            2025Q3
---
 dns/dnsmasq-devel/Makefile | 3 ++-
 dns/dnsmasq/Makefile       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index fe6698992e0f..2d71c213b862 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -33,7 +33,8 @@ MAKE_ARGS=	CC="${CC}" \
 CFLAGS+=	-Wall
 # https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html
 # Note there are ${ARCH}-dependent options below after .include <bsd.port.pre.mk>
-CFLAGS+=	-O2 -Wall -Wformat -Wformat=2 \
+# Note that these are enforced for now (2025-09-16), and we can't subject them to PIE/FORTIFY/SSP_UNSAFE or WITHOUT_ options for now.
+CFLAGS+=	-Wall -Wformat -Wformat=2 \
 		-Werror=format-security \
 		-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 \
 		-fstrict-flex-arrays=3 \
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 2c34b08f2547..c0cb701dbee6 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -28,7 +28,8 @@ MAKE_ARGS=	CC="${CC}" \
 CFLAGS+=	-Wall
 # https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html
 # Note there are ${ARCH}-dependent options below after .include <bsd.port.pre.mk>
-CFLAGS+=	-O2 -Wall -Wformat -Wformat=2 \
+# Note that these are enforced for now (2025-09-16), and we can't subject them to PIE/FORTIFY/SSP_UNSAFE or WITHOUT_ options for now.
+CFLAGS+=	-Wall -Wformat -Wformat=2 \
 		-Werror=format-security \
 		-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 \
 		-fstrict-flex-arrays=3 \