1 |
commit: bf286a7973d8b95dbef90f17cc8e2d66c19a47c8 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 30 08:30:15 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 30 08:31:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf286a79 |
7 |
|
8 |
dev-libs/gmp: tie --enable-fat to USE=cpudetection |
9 |
|
10 |
Note that USE=-cpudetection still gives a very generic |
11 |
build rather than one detected at build time to be |
12 |
precisely the machine compiled on (for now?) |
13 |
|
14 |
Bug: https://bugs.gentoo.org/883201 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
dev-libs/gmp/gmp-6.2.1-r3.ebuild | 7 ++++--- |
18 |
dev-libs/gmp/metadata.xml | 23 ++++++++++++----------- |
19 |
profiles/arch/amd64/package.use.mask | 4 ++++ |
20 |
profiles/arch/base/package.use.mask | 4 ++++ |
21 |
profiles/arch/x86/package.use.mask | 4 ++++ |
22 |
5 files changed, 28 insertions(+), 14 deletions(-) |
23 |
|
24 |
diff --git a/dev-libs/gmp/gmp-6.2.1-r3.ebuild b/dev-libs/gmp/gmp-6.2.1-r3.ebuild |
25 |
index dc0cb7b4c773..8e7bca104d30 100644 |
26 |
--- a/dev-libs/gmp/gmp-6.2.1-r3.ebuild |
27 |
+++ b/dev-libs/gmp/gmp-6.2.1-r3.ebuild |
28 |
@@ -27,7 +27,8 @@ LICENSE="|| ( LGPL-3+ GPL-2+ )" |
29 |
SLOT="0/10.4" |
30 |
# Unkeyworded temporarily for some more testing |
31 |
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
32 |
-IUSE="+asm doc +cxx pic static-libs" |
33 |
+IUSE="+asm doc +cpudetection +cxx pic static-libs" |
34 |
+REQUIRED_USE="cpudetection? ( asm )" |
35 |
|
36 |
BDEPEND=" |
37 |
app-arch/xz-utils |
38 |
@@ -93,14 +94,14 @@ multilib_src_configure() { |
39 |
--localstatedir="${EPREFIX}"/var/state/gmp |
40 |
--enable-shared |
41 |
|
42 |
+ $(use_enable asm assembly) |
43 |
# fat is needed to avoid gmp installing either purely generic |
44 |
# or specific-to-used-CPU (which our config.guess refresh prevents at the moment). |
45 |
# Both Fedora and opensuse use this option to tackle the issue, bug #883201. |
46 |
# |
47 |
# This only works for x86, so we're still getting non-performant |
48 |
# builds on other arches until we figure something out! |
49 |
- $(use_enable asm fat) |
50 |
- $(use_enable asm assembly) |
51 |
+ $(use_enable cpudetection fat) |
52 |
$(use_enable cxx) |
53 |
$(use_enable static-libs static) |
54 |
|
55 |
|
56 |
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml |
57 |
index e98fbcba6811..753f212d3e39 100644 |
58 |
--- a/dev-libs/gmp/metadata.xml |
59 |
+++ b/dev-libs/gmp/metadata.xml |
60 |
@@ -1,15 +1,16 @@ |
61 |
<?xml version="1.0" encoding="UTF-8"?> |
62 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
63 |
<pkgmetadata> |
64 |
-<maintainer type="project"> |
65 |
- <email>toolchain@g.o</email> |
66 |
- <name>Gentoo Toolchain Project</name> |
67 |
-</maintainer> |
68 |
-<use> |
69 |
- <flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag> |
70 |
- <flag name="pic">Force static libraries to be built as PIC to avoid TEXTRELs.</flag> |
71 |
-</use> |
72 |
-<upstream> |
73 |
- <remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id> |
74 |
-</upstream> |
75 |
+ <maintainer type="project"> |
76 |
+ <email>toolchain@g.o</email> |
77 |
+ <name>Gentoo Toolchain Project</name> |
78 |
+ </maintainer> |
79 |
+ <use> |
80 |
+ <flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag> |
81 |
+ <flag name="cpudetection">Enables runtime CPU detection (useful for binpkgs, compatibility on other CPUs)</flag> |
82 |
+ <flag name="pic">Force static libraries to be built as PIC to avoid TEXTRELs.</flag> |
83 |
+ </use> |
84 |
+ <upstream> |
85 |
+ <remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id> |
86 |
+ </upstream> |
87 |
</pkgmetadata> |
88 |
|
89 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
90 |
index 27207c6da3f9..4fa0267b5a1b 100644 |
91 |
--- a/profiles/arch/amd64/package.use.mask |
92 |
+++ b/profiles/arch/amd64/package.use.mask |
93 |
@@ -17,6 +17,10 @@ |
94 |
|
95 |
#--- END OF EXAMPLES --- |
96 |
|
97 |
+# Sam James <sam@g.o> (2022-11-30) |
98 |
+# Only effective on amd64/x86. |
99 |
+dev-libs/gmp -cpudetection |
100 |
+ |
101 |
# Guillermo Joandet <gjoandet@×××××.com> (2022-11-22) |
102 |
# app-text/pandoc is keyworded on this architecture |
103 |
net-libs/gssdp -man |
104 |
|
105 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
106 |
index 5a1455d90b27..a9a1bad325ca 100644 |
107 |
--- a/profiles/arch/base/package.use.mask |
108 |
+++ b/profiles/arch/base/package.use.mask |
109 |
@@ -1,6 +1,10 @@ |
110 |
# Copyright 1999-2022 Gentoo Authors |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
|
113 |
+# Sam James <sam@g.o> (2022-11-30) |
114 |
+# Only effective on amd64/x86. |
115 |
+dev-libs/gmp cpudetection |
116 |
+ |
117 |
# Mike Gilbert <floppym@g.o> (2022-10-16) |
118 |
# Only supported on MIPS. |
119 |
dev-lang/gnat-gpl fixed-point |
120 |
|
121 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
122 |
index a68e233ecfd9..20ce8131ba98 100644 |
123 |
--- a/profiles/arch/x86/package.use.mask |
124 |
+++ b/profiles/arch/x86/package.use.mask |
125 |
@@ -1,6 +1,10 @@ |
126 |
# Copyright 1999-2022 Gentoo Authors |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
|
129 |
+# Sam James <sam@g.o> (2022-11-30) |
130 |
+# Only effective on amd64/x86. |
131 |
+dev-libs/gmp -cpudetection |
132 |
+ |
133 |
# Michał Górny <mgorny@g.o> (2022-11-16) |
134 |
# spirv-llvm-translator is not keyworded x86. |
135 |
dev-libs/libclc spirv |