commit: b14df26895f8a4c582b325870c6ace190e85330b Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Sat Feb 18 13:42:49 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Mon Jun 5 21:14:38 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14df268
dev-util/strace: Fix ebuilds to support musl libc This change resolves a compilation error: typedef redefinition with different types. (cherry picked from commit 274bc28b9e69b3571994f29ebcb69bbeb1e0a34f) Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/4008 dev-util/strace/strace-4.13.ebuild | 1 + dev-util/strace/strace-4.16.ebuild | 1 + dev-util/strace/strace-4.17.ebuild | 1 + dev-util/strace/strace-9999.ebuild | 1 + 4 files changed, 4 insertions(+) diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild index d4d722c581c..8cc44de6059 100644 --- a/dev-util/strace/strace-4.13.ebuild +++ b/dev-util/strace/strace-4.13.ebuild @@ -42,6 +42,7 @@ src_prepare() { use static && append-ldflags -static export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no # Stub out the -k test since it's known to be flaky. #545812 sed -i '1iexit 77' tests*/strace-k.test || die diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.16.ebuild index 74b709da3f1..ce19fe29c67 100644 --- a/dev-util/strace/strace-4.16.ebuild +++ b/dev-util/strace/strace-4.16.ebuild @@ -42,6 +42,7 @@ src_prepare() { use static && append-ldflags -static export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no # Stub out the -k test since it's known to be flaky. #545812 sed -i '1iexit 77' tests*/strace-k.test || die diff --git a/dev-util/strace/strace-4.17.ebuild b/dev-util/strace/strace-4.17.ebuild index 11d04e224be..9ec77eb9b80 100644 --- a/dev-util/strace/strace-4.17.ebuild +++ b/dev-util/strace/strace-4.17.ebuild @@ -42,6 +42,7 @@ src_prepare() { use static && append-ldflags -static export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no # Stub out the -k test since it's known to be flaky. #545812 sed -i '1iexit 77' tests*/strace-k.test || die diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild index 11d04e224be..9ec77eb9b80 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-9999.ebuild @@ -42,6 +42,7 @@ src_prepare() { use static && append-ldflags -static export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no # Stub out the -k test since it's known to be flaky. #545812 sed -i '1iexit 77' tests*/strace-k.test || die
