Skip to contentSkip to conversation

share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's not already defined

PATCH In review Alejandro Colomar 1 participant 2 messages Jul 17, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's not already defined

---

Hi Sam,

I've tested it and it seems to work as one would expect.

Cheers,
Alex

Range-diff against v0:
-: --------- > 1: 1415c5704 share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's not already defined

 share/mk/configure/build-depends/cpp/cpp.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
share/mk/configure/build-depends/cpp/cpp.mk +17 -1
index 11ba5448d..ec8068458 100644
@@ -6,15 +6,31 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
 include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk
+include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 
 
+CPP := $(CC) $(CFLAGS_) -E
+
+
+CPP_HAS_ALREADY_D_FORTIFY_SOURCE := \
+	$(shell \
+		$(CPP) -dM - -Wno-error </dev/null \
+		| $(GREP) '#define _FORTIFY_SOURCE ' >/dev/null \
+		&& $(ECHO) yes \
+		|| $(ECHO) no; \
+	)
+
+
 DEFAULT_CPPFLAGS := \
 	$(shell $(PKGCONF_CMD) --cflags $(pc) $(HIDE_ERR)) \
-	-D_FORTIFY_SOURCE=2 \
 	-I$(srcdir)/
+ifeq ($(CPP_HAS_ALREADY_D_FORTIFY_SOURCE),no)
+DEFAULT_CPPFLAGS += -D_FORTIFY_SOURCE=2
+endif
 CPPFLAGS         :=
 CPPFLAGS_        := $(DEFAULT_CPPFLAGS) $(CPPFLAGS)
 CPP              := $(CC) $(CFLAGS_) -E

base-commit: a264f9442e64d555451104257538124f831db854

Signature · 1 line
2.45.2
#1 lore raw
Quoted 44 lines · Alejandro Colomar

---

Hi Sam,

I've tested it and it seems to work as one would expect.

Cheers,
Alex

Range-diff against v0:
-: --------- > 1: 1415c5704 share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's not already defined

 share/mk/configure/build-depends/cpp/cpp.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
share/mk/configure/build-depends/cpp/cpp.mk +14 -0
index 11ba5448d..ec8068458 100644
@@ -6,15 +6,31 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
 include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk
+include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 
 
+CPP := $(CC) $(CFLAGS_) -E
+
+
+CPP_HAS_ALREADY_D_FORTIFY_SOURCE := \
+	$(shell \
+		$(CPP) -dM - -Wno-error </dev/null \
+		| $(GREP) '#define _FORTIFY_SOURCE ' >/dev/null \
+		&& $(ECHO) yes \
+		|| $(ECHO) no; \
+	)
+
+

share/mk/configure/build-depends/cpp/cpp.mk ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED · line 36

Quoted 10 lines
share/mk/configure/build-depends/cpp/cpp.mk +3 -1
 DEFAULT_CPPFLAGS := \
 	$(shell $(PKGCONF_CMD) --cflags $(pc) $(HIDE_ERR)) \
-	-D_FORTIFY_SOURCE=2 \
 	-I$(srcdir)/
+ifeq ($(CPP_HAS_ALREADY_D_FORTIFY_SOURCE),no)
+DEFAULT_CPPFLAGS += -D_FORTIFY_SOURCE=2
+endif
 CPPFLAGS         :=
 CPPFLAGS_        := $(DEFAULT_CPPFLAGS) $(CPPFLAGS)
 CPP              := $(CC) $(CFLAGS_) -E

Oops, I forgot to remove this line. It's removed now in v2.

Quoted 5 lines

base-commit: a264f9442e64d555451104257538124f831db854

Signature · 1 line
2.45.2
Signature · 1 line
<https://www.alejandro-colomar.es/>