From 289418fab1a93a03a18851cfed83f0c77e80ad72 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 23 Apr 2017 18:59:45 -0700 Subject: [PATCH] dev-util/android-tools: re-apply fix for bug 580686 Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-util/android-tools/android-tools-6.0.1_p79.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild index 61a84f5ea642..f5e1750c5427 100644 --- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild +++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild @@ -52,6 +52,10 @@ src_prepare() { mv core/*/* core/ || die epatch arch/*/trunk/fix_build.patch cp arch/*/trunk/generate_build.rb ./ || die + sed -e 's|^#include $|/*\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 default } -- 2.26.2