[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/

[Zac Medico]

commit:     11389cfde3266d32dc425e66c46a934c24647c8c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 00:05:57 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 16 00:07:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11389cfd

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

Package-Manager: portage-2.2.28

 dev-util/android-tools/android-tools-5.1.1_p13.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

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 5b4a2fc..4111441 100644
--- 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
 }