dev-util/android-tools: fix cdefs.h usage for musl bug 580686

Package-Manager: portage-2.2.28

diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 5b4a2fc1ebf5a688887f688db06e09acc97bf19d..4111441f36fd535c04e3bb9338220b1ca623b099 100644 (file)
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -53,6 +53,10 @@ src_prepare() {
                -i extras/f2fs_utils/f2fs_utils.c  || die
        mv arch/*/trunk/Makefile ./ || die
        sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058
+       sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
+               -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
+               -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+               -i extras/ext4_utils/sha1.{c,h} || die #580686
        tc-export CC
 }