diff options
| author |   Sam James <sam@gentoo.org> | 2022-06-01 01:30:40 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-06-01 01:31:36 +0100 |
| commit | f017304f5a38b4bcd0712759876997af96431fbc (patch) | |
| tree | 11005c309445101b4d9dad6d007a568c2c6a530a /sys-cluster | |
| parent | sys-cluster/kronosnet: remove -Werror (diff) | |
| download | gentoo-f017304f5a38b4bcd0712759876997af96431fbc.tar.gz gentoo-f017304f5a38b4bcd0712759876997af96431fbc.tar.bz2 gentoo-f017304f5a38b4bcd0712759876997af96431fbc.zip | |
sys-cluster/kronosnet: don't set FORTIFY_SOURCE=2 twice; forward Werror patch
Closes: https://bugs.gentoo.org/847790
Bug: https://bugs.gentoo.org/750548
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch | 18 | ||||
| -rw-r--r-- | sys-cluster/kronosnet/kronosnet-1.23.ebuild | 5 |
2 files changed, 23 insertions, 0 deletions
diff --git a/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch b/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch new file mode 100644 index 000000000000..83acebb40298 --- /dev/null +++ b/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch @@ -0,0 +1,18 @@ +We already set this via GCC (patched in) and setting it individually per-package +like this causes redefinition errors if folks try to use the new =3 level. + +So, protection is the same without this, and this patch removes +the trouble of upgrading to =3 which we're working on. + +https://bugs.gentoo.org/847790 +--- a/configure.ac ++++ b/configure.ac +@@ -324,7 +324,7 @@ if test "x${enable_debug}" = xyes; then + FORTIFY_CFLAGS="" + else + OPT_CFLAGS="-O3" +- FORTIFY_CFLAGS="-D_FORTIFY_SOURCE=2" ++ FORTIFY_CFLAGS="" + fi + + # Check for availablility of hardening options diff --git a/sys-cluster/kronosnet/kronosnet-1.23.ebuild b/sys-cluster/kronosnet/kronosnet-1.23.ebuild index 115a30239682..355e4941778f 100644 --- a/sys-cluster/kronosnet/kronosnet-1.23.ebuild +++ b/sys-cluster/kronosnet/kronosnet-1.23.ebuild @@ -30,6 +30,11 @@ BDEPEND=" app-doc/doxygen[dot] )" +PATCHES=( + "${FILESDIR}"/${PN}-1.19-no-Werror.patch + "${FILESDIR}"/${PN}-1.23-no-extra-fortify-source.patch +) + src_configure() { local myeconfargs=( $(use_enable doc man) |