From 77d14e391ff2e16b239ac4a4f653f4c708bb62ea Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Tue, 3 Sep 2024 10:25:44 +0200 Subject: [PATCH] miniupnpd: Makefile: do not override `_FORTIFY_SOURCE` if defined --- miniupnpd/Makefile.linux | 10 ++++++++-- miniupnpd/Makefile.linux_nft | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux index 1c81f92..8c887d0 100644 --- a/miniupnpd/Makefile.linux +++ b/miniupnpd/Makefile.linux @@ -23,13 +23,19 @@ # CONFIG_OPTIONS ?= $(cat .configure.cache) CONFIG_OPTIONS += --firewall=iptables + +# Make sucks, prove me wrong +, := , +ifeq ($(filter -D_FORTIFY_SOURCE=% -Wp$(,)-D_FORTIFY_SOURCE=%,$(CPPFLAGS) $(CFLAGS)),) +CPPFLAGS += -D_FORTIFY_SOURCE=2 +endif +CPPFLAGS += -D_GNU_SOURCE + #CFLAGS = -O -g -DDEBUG CFLAGS ?= -Os CFLAGS += -fno-strict-aliasing CFLAGS += -fno-common CFLAGS += -fstack-protector -fPIE -CFLAGS += -D_FORTIFY_SOURCE=2 -CPPFLAGS += -D_GNU_SOURCE CFLAGS += -Wall CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement #CFLAGS += -Wno-missing-field-initializers diff --git a/miniupnpd/Makefile.linux_nft b/miniupnpd/Makefile.linux_nft index 4baa77c..f66077e 100644 --- a/miniupnpd/Makefile.linux_nft +++ b/miniupnpd/Makefile.linux_nft @@ -19,13 +19,19 @@ # CONFIG_OPTIONS ?= $(cat .configure.cache) CONFIG_OPTIONS += --firewall=nftables + +# Make sucks, prove me wrong +, := , +ifeq ($(filter -D_FORTIFY_SOURCE=% -Wp$(,)-D_FORTIFY_SOURCE=%,$(CPPFLAGS) $(CFLAGS)),) +CPPFLAGS += -D_FORTIFY_SOURCE=2 +endif +CPPFLAGS += -D_GNU_SOURCE + #CFLAGS = -O -g #-DDEBUG CFLAGS ?= -Os CFLAGS += -fno-strict-aliasing CFLAGS += -fno-common CFLAGS += -fstack-protector -fPIE -CFLAGS += -D_FORTIFY_SOURCE=2 -CPPFLAGS += -D_GNU_SOURCE CFLAGS += -Wall CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement #CFLAGS += -Wno-missing-field-initializers