1 |
commit: 77615d7b99d8048194e82df0103e69756b0ca864 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 27 05:37:24 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 27 05:37:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77615d7b |
7 |
|
8 |
dev-util/google-perftools: minor ebuild tidying, fix typo in 2.9.1-r1 too |
9 |
|
10 |
Bug: https://bugs.gentoo.org/818871 |
11 |
Bug: https://bugs.gentoo.org/820449 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
...ols-2.9.1-r1.ebuild => google-perftools-2.9.1-r2.ebuild} | 13 +++++++++---- |
15 |
1 file changed, 9 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/google-perftools/google-perftools-2.9.1-r1.ebuild b/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild |
18 |
similarity index 92% |
19 |
rename from dev-util/google-perftools/google-perftools-2.9.1-r1.ebuild |
20 |
rename to dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild |
21 |
index ed4a219b335..0ac7aaf851d 100644 |
22 |
--- a/dev-util/google-perftools/google-perftools-2.9.1-r1.ebuild |
23 |
+++ b/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild |
24 |
@@ -4,7 +4,7 @@ |
25 |
EAPI=7 |
26 |
|
27 |
MY_P="gperftools-${PV}" |
28 |
-inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal |
29 |
+inherit flag-o-matic autotools vcs-snapshot multilib-minimal |
30 |
|
31 |
DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools" |
32 |
HOMEPAGE="https://github.com/gperftools/gperftools" |
33 |
@@ -64,13 +64,18 @@ multilib_src_configure() { |
34 |
use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW |
35 |
append-flags -fno-strict-aliasing -fno-omit-frame-pointer |
36 |
|
37 |
- local myconfargs=( |
38 |
+ local myeconfargs=( |
39 |
--enable-shared |
40 |
$(use_enable static-libs static) |
41 |
$(use_enable debug debugalloc) |
42 |
- $(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi) |
43 |
) |
44 |
|
45 |
+ if [[ ${ABI} == x32 ]]; then |
46 |
+ myeconfargs+=( --enable-minimal ) |
47 |
+ else |
48 |
+ myeconfargs+=( $(use_enable minimal) ) |
49 |
+ fi |
50 |
+ |
51 |
if use arm64 || use s390; then |
52 |
# Use the same arches for disabling TLS (thread local storage) |
53 |
# as Fedora, but we might need to expand this list if we get |
54 |
@@ -78,7 +83,7 @@ multilib_src_configure() { |
55 |
myeconfargs+=( --disable-general-dynamic-tls ) |
56 |
fi |
57 |
|
58 |
- econf "${myconfargs[@]}" |
59 |
+ econf "${myeconfargs[@]}" |
60 |
} |
61 |
|
62 |
src_test() { |