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

--euoe7g3ydldxcb64
Content-Type: text/plain; protected-headers=v1; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
From: Alejandro Colomar <[email protected]>
To: [email protected]
Cc: Alejandro Colomar <[email protected]>, Sam James <[email protected]>
Subject: [PATCH v1] share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's
 not already defined
MIME-Version: 1.0

Reported-by: Sam James <[email protected]>
Signed-off-by: Alejandro Colomar <[email protected]>
---

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_SOU=
RCE if it's not already defined

 share/mk/configure/build-depends/cpp/cpp.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/share/mk/configure/build-depends/cpp/cpp.mk b/share/mk/configu=
re/build-depends/cpp/cpp.mk
index 11ba5448d..ec8068458 100644
--- a/share/mk/configure/build-depends/cpp/cpp.mk
+++ b/share/mk/configure/build-depends/cpp/cpp.mk
@@ -6,15 +6,31 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED :=3D 1
=20
=20
+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
=20
=20
+CPP :=3D $(CC) $(CFLAGS_) -E
+
+
+CPP_HAS_ALREADY_D_FORTIFY_SOURCE :=3D \
+	$(shell \
+		$(CPP) -dM - -Wno-error </dev/null \
+		| $(GREP) '#define _FORTIFY_SOURCE ' >/dev/null \
+		&& $(ECHO) yes \
+		|| $(ECHO) no; \
+	)
+
+
 DEFAULT_CPPFLAGS :=3D \
 	$(shell $(PKGCONF_CMD) --cflags $(pc) $(HIDE_ERR)) \
-	-D_FORTIFY_SOURCE=3D2 \
 	-I$(srcdir)/
+ifeq ($(CPP_HAS_ALREADY_D_FORTIFY_SOURCE),no)
+DEFAULT_CPPFLAGS +=3D -D_FORTIFY_SOURCE=3D2
+endif
 CPPFLAGS         :=3D
 CPPFLAGS_        :=3D $(DEFAULT_CPPFLAGS) $(CPPFLAGS)
 CPP              :=3D $(CC) $(CFLAGS_) -E

base-commit: a264f9442e64d555451104257538124f831db854
--=20
2.45.2


--euoe7g3ydldxcb64
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEE6jqH8KTroDDkXfJAnowa+77/2zIFAmaX+ogACgkQnowa+77/
2zLK6xAAiDiLQMY1JHWWmzqCPMwsQuhb2gddWJw5wh0X7u/zzCC+9TodmC2hiQmf
A9/Xj2QbcrZ0VQbXiZu+yas1rtd2QwDfUv1/98i/P498g0eThPD9ecsN4+8dH4wD
iZEXBPqWzViroaZ+f+1bO59wv2c3CFfBYWby+4bCI6sM5ViglvkGECLb0A4NZY0n
zePUleCBCdqO4hFt1SSa9NA0By4YqADFSaX0L1O7wAYQ2uUOAk44Oz+KN3GKH+AT
kiftrTrb+QSY3asXBJ8yysGa0wEZzUdmNS9+H7RwZuizElI9gOFLH6fuqV4Zjb+d
9P5boADzd94KG8zr0zLSFqkO8eP9bNeq7u4t0vIWwt3xYfQXIlitpnmDTNymzfSq
kvYWjVD9Vg3tj/pipga3wlEIglN9c90BnznfW641+a9HeJ/hU58VLJ5Exx3IKvJj
YgVXLR2pRsb2+kyB+hSr1qleRW2B244GAIHVuEyOLLUNuWekqFTMvyFNpdzse8NG
suBeETCuredmujgq/QuaOym9cntqvM2PNa+N0FxIzaPiOcpSbDG5O5/qefEZLVhb
2pGmskmjjKwga2okwCwXguOwm04Eb/fqAr0qEA8Tp0jdxSrIvYBznAK+kJze4mxK
F52cdhyCugy2X8hXW9iArgeltpjrP2XnjYX5bF8OoEsALafVEGA=
=hJ+J
-----END PGP SIGNATURE-----

--euoe7g3ydldxcb64--