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@gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/4008

diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild
index d4d722c581c43bd51fce086ffe0a0e5c1b3f2bae..8cc44de60594fd47e3bbe9f63ae1d6772f260c11 100644 (file)
--- 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 74b709da3f1418b81ad562c15c97a1652d5e5907..ce19fe29c67d635e4ae30b9a2717f85fd6b9fdc9 100644 (file)
--- 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 11d04e224bee27251132fafb355e3c4ff6eaad71..9ec77eb9b8068bd325ea8d9ab2ea8008a7f814fb 100644 (file)
--- 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 11d04e224bee27251132fafb355e3c4ff6eaad71..9ec77eb9b8068bd325ea8d9ab2ea8008a7f814fb 100644 (file)
--- 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