1 |
commit: cd833222cbaef1cd344f3b06c528b858c06dc04a |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 11 20:17:33 2021 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 11 20:21:56 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd833222 |
7 |
|
8 |
sys-devel/binutils: make CET optional (and disabled by default) |
9 |
|
10 |
Reported-by: subzero_ro <AT> yahoo.com |
11 |
Bug: https://bugs.gentoo.org/770061 |
12 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
sys-devel/binutils/binutils-2.35.1-r1.ebuild | 7 ++++++- |
16 |
sys-devel/binutils/binutils-2.35.2.ebuild | 7 ++++++- |
17 |
sys-devel/binutils/binutils-2.36.1.ebuild | 7 ++++++- |
18 |
sys-devel/binutils/binutils-9999.ebuild | 7 ++++++- |
19 |
sys-devel/binutils/metadata.xml | 1 + |
20 |
5 files changed, 25 insertions(+), 4 deletions(-) |
21 |
|
22 |
diff --git a/sys-devel/binutils/binutils-2.35.1-r1.ebuild b/sys-devel/binutils/binutils-2.35.1-r1.ebuild |
23 |
index a98e259e36a..516f5642244 100644 |
24 |
--- a/sys-devel/binutils/binutils-2.35.1-r1.ebuild |
25 |
+++ b/sys-devel/binutils/binutils-2.35.1-r1.ebuild |
26 |
@@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs |
27 |
DESCRIPTION="Tools necessary to build programs" |
28 |
HOMEPAGE="https://sourceware.org/binutils/" |
29 |
LICENSE="GPL-3+" |
30 |
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
31 |
+IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
32 |
REQUIRED_USE="default-gold? ( gold )" |
33 |
|
34 |
# Variables that can be set here (ignored for live ebuilds) |
35 |
@@ -265,6 +265,11 @@ src_configure() { |
36 |
# avoid automagic dependency on (currently prefix) systems |
37 |
# systems with debuginfod library, bug #754753 |
38 |
--without-debuginfod |
39 |
+ |
40 |
+ # Allow user to opt into CET for host libraries. |
41 |
+ # Ideally we would like automagic-or-disabled here. |
42 |
+ # But the check does not quite work on i686: bug #760926. |
43 |
+ $(use_enable cet) |
44 |
) |
45 |
echo ./configure "${myconf[@]}" |
46 |
"${S}"/configure "${myconf[@]}" || die |
47 |
|
48 |
diff --git a/sys-devel/binutils/binutils-2.35.2.ebuild b/sys-devel/binutils/binutils-2.35.2.ebuild |
49 |
index dae533747ec..2aff2770014 100644 |
50 |
--- a/sys-devel/binutils/binutils-2.35.2.ebuild |
51 |
+++ b/sys-devel/binutils/binutils-2.35.2.ebuild |
52 |
@@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs |
53 |
DESCRIPTION="Tools necessary to build programs" |
54 |
HOMEPAGE="https://sourceware.org/binutils/" |
55 |
LICENSE="GPL-3+" |
56 |
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
57 |
+IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
58 |
REQUIRED_USE="default-gold? ( gold )" |
59 |
|
60 |
# Variables that can be set here (ignored for live ebuilds) |
61 |
@@ -264,6 +264,11 @@ src_configure() { |
62 |
# avoid automagic dependency on (currently prefix) systems |
63 |
# systems with debuginfod library, bug #754753 |
64 |
--without-debuginfod |
65 |
+ |
66 |
+ # Allow user to opt into CET for host libraries. |
67 |
+ # Ideally we would like automagic-or-disabled here. |
68 |
+ # But the check does not quite work on i686: bug #760926. |
69 |
+ $(use_enable cet) |
70 |
) |
71 |
echo ./configure "${myconf[@]}" |
72 |
"${S}"/configure "${myconf[@]}" || die |
73 |
|
74 |
diff --git a/sys-devel/binutils/binutils-2.36.1.ebuild b/sys-devel/binutils/binutils-2.36.1.ebuild |
75 |
index 209b2daf9db..3d820fcc6f8 100644 |
76 |
--- a/sys-devel/binutils/binutils-2.36.1.ebuild |
77 |
+++ b/sys-devel/binutils/binutils-2.36.1.ebuild |
78 |
@@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs |
79 |
DESCRIPTION="Tools necessary to build programs" |
80 |
HOMEPAGE="https://sourceware.org/binutils/" |
81 |
LICENSE="GPL-3+" |
82 |
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
83 |
+IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
84 |
REQUIRED_USE="default-gold? ( gold )" |
85 |
|
86 |
# Variables that can be set here (ignored for live ebuilds) |
87 |
@@ -264,6 +264,11 @@ src_configure() { |
88 |
# avoid automagic dependency on (currently prefix) systems |
89 |
# systems with debuginfod library, bug #754753 |
90 |
--without-debuginfod |
91 |
+ |
92 |
+ # Allow user to opt into CET for host libraries. |
93 |
+ # Ideally we would like automagic-or-disabled here. |
94 |
+ # But the check does not quite work on i686: bug #760926. |
95 |
+ $(use_enable cet) |
96 |
) |
97 |
echo ./configure "${myconf[@]}" |
98 |
"${S}"/configure "${myconf[@]}" || die |
99 |
|
100 |
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild |
101 |
index 50d528443d7..014a2d71612 100644 |
102 |
--- a/sys-devel/binutils/binutils-9999.ebuild |
103 |
+++ b/sys-devel/binutils/binutils-9999.ebuild |
104 |
@@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs |
105 |
DESCRIPTION="Tools necessary to build programs" |
106 |
HOMEPAGE="https://sourceware.org/binutils/" |
107 |
LICENSE="GPL-3+" |
108 |
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
109 |
+IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" |
110 |
REQUIRED_USE="default-gold? ( gold )" |
111 |
|
112 |
# Variables that can be set here (ignored for live ebuilds) |
113 |
@@ -265,6 +265,11 @@ src_configure() { |
114 |
# avoid automagic dependency on (currently prefix) systems |
115 |
# systems with debuginfod library, bug #754753 |
116 |
--without-debuginfod |
117 |
+ |
118 |
+ # Allow user to opt into CET for host libraries. |
119 |
+ # Ideally we would like automagic-or-disabled here. |
120 |
+ # But the check does not quite work on i686: bug #760926. |
121 |
+ $(use_enable cet) |
122 |
) |
123 |
echo ./configure "${myconf[@]}" |
124 |
"${S}"/configure "${myconf[@]}" || die |
125 |
|
126 |
diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml |
127 |
index 66f4f23df42..165a135caf6 100644 |
128 |
--- a/sys-devel/binutils/metadata.xml |
129 |
+++ b/sys-devel/binutils/metadata.xml |
130 |
@@ -6,6 +6,7 @@ |
131 |
<name>Gentoo Toolchain Project</name> |
132 |
</maintainer> |
133 |
<use> |
134 |
+ <flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag> |
135 |
<flag name="default-gold">Set ld to point to ld.gold instead of ld.bfd</flag> |
136 |
<flag name="gold">Build ld.gold linker</flag> |
137 |
<flag name="plugins">Enable plugin support in tools</flag> |