Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D80CB1E4A6 for ; Wed, 17 Jul 2024 17:08:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721236106; cv=none; b=Ba4xjdVLGk6KeKIWR6A1uvK5eUNTPXSmmy8bHh+kP8dhHn4UXlExfb+cAITqQBxR5zlRmRpWP6Xn+/NkKcMQC2TxLRYjJ5V24vWavGzl8Jlsfx6oWivFaRejVsIZeSJutvca/vvSGl3VG+LZWYw7Xd8i46l9VGGJhx3I7nuKS74= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721236106; c=relaxed/simple; bh=kU7UHIU3m3/Ev+1a4O+ahdeokypc1xGx3DN3bi5CROU=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Dc72EUx71MOWITiLuKwVt5fOYgiRbcLBOdLpP0/wlVSdwpalPj6Y3UpgMsAKjgxCpK+2CczI1MOxW9AYr14Cg5wWTWU3a2rBCNIBHa/ipCwWkM0HFKA36OQUP788WfcZS0g+qSR/ctrXmFpm1Y7i+NU2kTuTtijfuHjWrWC212k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kioTjXvf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kioTjXvf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9D40C2BD10; Wed, 17 Jul 2024 17:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721236106; bh=kU7UHIU3m3/Ev+1a4O+ahdeokypc1xGx3DN3bi5CROU=; h=Date:From:To:Cc:Subject:From; b=kioTjXvfq8BcWH3TVAP4S8z2DsKaYDVCaS7bMtGN+WwlgcPJ+GZ8cK5TNHCd+71wd iU0k0F+FnzbYXCsMnY0zurFv2rRQ5RUM685vJWFE011RF7Ta4iseGEDehYn3HGCn5M Goy4KkmjIAqxhQ8kdeDUJIP5RNy+GFC9ygn7IQJH4wuGMnQYqZw+ucEZLxl+WNmKuC 1Pau6qtFmBLtJT/PoIkSD2+8YBDsb5ZpLGa1O/JIeKxB0CQzGsUcASF4ByaFTSs1wM tonQRtdxsGSX7yaHp3rJ9cGoUYZrVZjjGzDyIb/P1OAD4O8sPDsYpJS85UjxV3acCO yg81ZhMmTVURQ== Date: Wed, 17 Jul 2024 19:08:24 +0200 From: Alejandro Colomar To: liba2i@lists.linux.dev Cc: Alejandro Colomar , Sam James Subject: [PATCH v1] share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's not already defined Message-ID: <20240717170814.21109-2-alx@kernel.org> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: liba2i@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="euoe7g3ydldxcb64" Content-Disposition: inline --euoe7g3ydldxcb64 Content-Type: text/plain; protected-headers=v1; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable From: Alejandro Colomar To: liba2i@lists.linux.dev Cc: Alejandro Colomar , Sam James Subject: [PATCH v1] share/mk/: CPPFLAGS: Only define _FORTIFY_SOURCE if it's not already defined MIME-Version: 1.0 Reported-by: Sam James Signed-off-by: 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_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 \ + && $(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--