commit: d2f7c9935b63554f65183746c7460f211a803c79 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Thu Feb 11 20:17:51 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Thu Feb 11 20:21:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f7c993
sys-devel/binutils-hppa64: make CET optional (and disabled by default) Reported-by: subzero_ro <AT> yahoo.com Bug: https://bugs.gentoo.org/770061 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild | 7 ++++++- sys-devel/binutils-hppa64/binutils-hppa64-2.35.2.ebuild | 7 ++++++- sys-devel/binutils-hppa64/binutils-hppa64-2.36.1.ebuild | 7 ++++++- sys-devel/binutils-hppa64/metadata.xml | 1 + 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild index 5a302e9061f..303efe28c2d 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild @@ -10,7 +10,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/"; LICENSE="GPL-3+" -IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" +IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test" REQUIRED_USE="default-gold? ( gold )" # Variables that can be set here: @@ -253,6 +253,11 @@ src_configure() { # avoid automagic dependency on (currently prefix) systems # systems with debuginfod library, bug #754753 --without-debuginfod + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) ) echo ./configure "${myconf[@]}" "${S}"/configure "${myconf[@]}" || die diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.2.ebuild index 27d0f88efc6..97aa5834c6b 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.2.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.2.ebuild @@ -10,7 +10,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/"; LICENSE="GPL-3+" -IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" +IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test" REQUIRED_USE="default-gold? ( gold )" # Variables that can be set here: @@ -253,6 +253,11 @@ src_configure() { # avoid automagic dependency on (currently prefix) systems # systems with debuginfod library, bug #754753 --without-debuginfod + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) ) echo ./configure "${myconf[@]}" "${S}"/configure "${myconf[@]}" || die diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1.ebuild index f26da6552ae..e4ac93eb4d7 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1.ebuild @@ -10,7 +10,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/"; LICENSE="GPL-3+" -IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" +IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test" REQUIRED_USE="default-gold? ( gold )" # Variables that can be set here: @@ -253,6 +253,11 @@ src_configure() { # avoid automagic dependency on (currently prefix) systems # systems with debuginfod library, bug #754753 --without-debuginfod + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) ) echo ./configure "${myconf[@]}" "${S}"/configure "${myconf[@]}" || die diff --git a/sys-devel/binutils-hppa64/metadata.xml b/sys-devel/binutils-hppa64/metadata.xml index 028ab8dc65c..35c85c00a3a 100644 --- a/sys-devel/binutils-hppa64/metadata.xml +++ b/sys-devel/binutils-hppa64/metadata.xml @@ -10,6 +10,7 @@ <name>Gentoo Toolchain Project</name> </maintainer> <use> + <flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag> <flag name="default-gold">Set ld to point to ld.gold instead of ld.bfd</flag> <flag name="gold">Build ld.gold linker</flag> <flag name="plugins">Enable plugin support in tools</flag>
