1 |
commit: ebf183727b8469b7ab63ed682a2ac185c6c7f963 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 6 23:21:41 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 6 23:29:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf18372 |
7 |
|
8 |
toolchain.eclass: restore RESTRICT=strip on <gcc-9.2-r1, bug #699446 |
9 |
|
10 |
commit d16e2840220 ("rename USE=regression-test to USE=test") |
11 |
added a 'RESTRICT="!test? ( test )"' assignment and accidentally |
12 |
overrode existing RESTRICT="strip" one. That reintroduced excessive |
13 |
stripping regression. |
14 |
|
15 |
Move RESTRICT assignments closer to one another and restore |
16 |
RESTRICT="strip". |
17 |
|
18 |
Reported-by: sargastic <AT> gmail.com |
19 |
Closes: https://bugs.gentoo.org/699446 |
20 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
21 |
|
22 |
eclass/toolchain.eclass | 20 ++++++++++---------- |
23 |
1 file changed, 10 insertions(+), 10 deletions(-) |
24 |
|
25 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
26 |
index 5f8fd446c61..99643eafdd0 100644 |
27 |
--- a/eclass/toolchain.eclass |
28 |
+++ b/eclass/toolchain.eclass |
29 |
@@ -30,16 +30,6 @@ case ${EAPI:-0} in |
30 |
*) die "I don't speak EAPI ${EAPI}." ;; |
31 |
esac |
32 |
|
33 |
-tc_supports_dostrip() { |
34 |
- case ${EAPI:-0} in |
35 |
- 5*|6) return 1 ;; |
36 |
- 7) return 0 ;; |
37 |
- *) die "Update apply_patches() for ${EAPI}." ;; |
38 |
- esac |
39 |
-} |
40 |
- |
41 |
-tc_supports_dostrip || RESTRICT="strip" # cross-compilers need controlled stripping |
42 |
- |
43 |
EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \ |
44 |
src_compile src_test src_install pkg_postinst pkg_postrm |
45 |
|
46 |
@@ -140,6 +130,16 @@ fi |
47 |
IUSE="test vanilla +nls" |
48 |
RESTRICT="!test? ( test )" |
49 |
|
50 |
+tc_supports_dostrip() { |
51 |
+ case ${EAPI:-0} in |
52 |
+ 5*|6) return 1 ;; |
53 |
+ 7) return 0 ;; |
54 |
+ *) die "Update apply_patches() for ${EAPI}." ;; |
55 |
+ esac |
56 |
+} |
57 |
+ |
58 |
+tc_supports_dostrip || RESTRICT+=" strip" # cross-compilers need controlled stripping |
59 |
+ |
60 |
TC_FEATURES=() |
61 |
|
62 |
tc_has_feature() { |