From b14df26895f8a4c582b325870c6ace190e85330b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20Van=C4=9Bk?= Date: Sat, 18 Feb 2017 14:42:49 +0100 Subject: [PATCH] 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 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 d4d722c581c4..8cc44de60594 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 74b709da3f14..ce19fe29c67d 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 11d04e224bee..9ec77eb9b806 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 11d04e224bee..9ec77eb9b806 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 -- 2.26.2