| 1 |
commit: b14df26895f8a4c582b325870c6ace190e85330b |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Sat Feb 18 13:42:49 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 5 21:14:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14df268 |
| 7 |
|
| 8 |
dev-util/strace: Fix ebuilds to support musl libc |
| 9 |
|
| 10 |
This change resolves a compilation error: typedef redefinition with |
| 11 |
different types. |
| 12 |
|
| 13 |
(cherry picked from commit 274bc28b9e69b3571994f29ebcb69bbeb1e0a34f) |
| 14 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 15 |
Fixes: https://github.com/gentoo/gentoo/pull/4008 |
| 16 |
|
| 17 |
dev-util/strace/strace-4.13.ebuild | 1 + |
| 18 |
dev-util/strace/strace-4.16.ebuild | 1 + |
| 19 |
dev-util/strace/strace-4.17.ebuild | 1 + |
| 20 |
dev-util/strace/strace-9999.ebuild | 1 + |
| 21 |
4 files changed, 4 insertions(+) |
| 22 |
|
| 23 |
diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild |
| 24 |
index d4d722c581c..8cc44de6059 100644 |
| 25 |
--- a/dev-util/strace/strace-4.13.ebuild |
| 26 |
+++ b/dev-util/strace/strace-4.13.ebuild |
| 27 |
@@ -42,6 +42,7 @@ src_prepare() { |
| 28 |
use static && append-ldflags -static |
| 29 |
|
| 30 |
export ac_cv_header_libaio_h=$(usex aio) |
| 31 |
+ use elibc_musl && export ac_cv_header_stdc=no |
| 32 |
|
| 33 |
# Stub out the -k test since it's known to be flaky. #545812 |
| 34 |
sed -i '1iexit 77' tests*/strace-k.test || die |
| 35 |
|
| 36 |
diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.16.ebuild |
| 37 |
index 74b709da3f1..ce19fe29c67 100644 |
| 38 |
--- a/dev-util/strace/strace-4.16.ebuild |
| 39 |
+++ b/dev-util/strace/strace-4.16.ebuild |
| 40 |
@@ -42,6 +42,7 @@ src_prepare() { |
| 41 |
use static && append-ldflags -static |
| 42 |
|
| 43 |
export ac_cv_header_libaio_h=$(usex aio) |
| 44 |
+ use elibc_musl && export ac_cv_header_stdc=no |
| 45 |
|
| 46 |
# Stub out the -k test since it's known to be flaky. #545812 |
| 47 |
sed -i '1iexit 77' tests*/strace-k.test || die |
| 48 |
|
| 49 |
diff --git a/dev-util/strace/strace-4.17.ebuild b/dev-util/strace/strace-4.17.ebuild |
| 50 |
index 11d04e224be..9ec77eb9b80 100644 |
| 51 |
--- a/dev-util/strace/strace-4.17.ebuild |
| 52 |
+++ b/dev-util/strace/strace-4.17.ebuild |
| 53 |
@@ -42,6 +42,7 @@ src_prepare() { |
| 54 |
use static && append-ldflags -static |
| 55 |
|
| 56 |
export ac_cv_header_libaio_h=$(usex aio) |
| 57 |
+ use elibc_musl && export ac_cv_header_stdc=no |
| 58 |
|
| 59 |
# Stub out the -k test since it's known to be flaky. #545812 |
| 60 |
sed -i '1iexit 77' tests*/strace-k.test || die |
| 61 |
|
| 62 |
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild |
| 63 |
index 11d04e224be..9ec77eb9b80 100644 |
| 64 |
--- a/dev-util/strace/strace-9999.ebuild |
| 65 |
+++ b/dev-util/strace/strace-9999.ebuild |
| 66 |
@@ -42,6 +42,7 @@ src_prepare() { |
| 67 |
use static && append-ldflags -static |
| 68 |
|
| 69 |
export ac_cv_header_libaio_h=$(usex aio) |
| 70 |
+ use elibc_musl && export ac_cv_header_stdc=no |
| 71 |
|
| 72 |
# Stub out the -k test since it's known to be flaky. #545812 |
| 73 |
sed -i '1iexit 77' tests*/strace-k.test || die |
Archives