commit: 5fcd64b166b2f212be146da7541114923af83fd9 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Mon Jan 29 20:23:34 2018 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Mon Jan 29 20:23:34 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5fcd64b1
dev-util/android-tools: more musl patches .../android-tools/android-tools-8.1.0_p1.ebuild | 1 + .../files/android-tools-8.1.0_p1-musl.patch | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild index 6160dd3..a1cc4d3 100644 --- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild +++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild @@ -74,6 +74,7 @@ src_prepare() { cd "${S}"/core eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch eapply "${FILESDIR}"/${P}-build.patch + eapply "${FILESDIR}"/${P}-musl.patch sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508 cd "${S}"/selinux diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch new file mode 100644 index 0000000..4b25964 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch @@ -0,0 +1,42 @@ +--- a/base/logging.cpp ++++ b/base/logging.cpp +@@ -28,7 +28,7 @@ + // For getprogname(3) or program_invocation_short_name. + #if defined(__ANDROID__) || defined(__APPLE__) + #include <stdlib.h> +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + #include <errno.h> + #endif + +@@ -90,7 +90,7 @@ + } + + namespace { +-#if defined(__GLIBC__) ++#if defined(__linux__) + const char* getprogname() { + return program_invocation_short_name; + } +--- a/adb/diagnose_usb.cpp 2018-01-29 12:05:10.466834056 -0800 ++++ b/adb/diagnose_usb.cpp 2018-01-29 12:13:20.980825271 -0800 +@@ -33,7 +33,7 @@ + // Returns a message describing any potential problems we find with udev, or an empty string if we + // can't find plugdev information (i.e. udev is not installed). + static std::string GetUdevProblem() { +-#if defined(__linux__) ++#if defined(__GLIBC__) + errno = 0; + group* plugdev_group = getgrnam("plugdev"); + +--- a/fastboot/socket.cpp 2018-01-29 12:05:10.493834055 -0800 ++++ b/fastboot/socket.cpp 2018-01-29 12:17:23.666820925 -0800 +@@ -28,6 +28,8 @@ + + #include "socket.h" + ++#include <sys/select.h> ++ + #include <android-base/errors.h> + #include <android-base/stringprintf.h> +