From: Petr Štetiar <ynezz@true.cz>
Date: Mon, 5 Aug 2019 09:48:47 +0000 (+0200)
Subject: adb: fix build breakage on recent musl
X-Git-Tag: v19.07.0-rc1~358
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff550dae32ea431de9d74c11f77f28c62c935204;p=openwrt%2Fstaging%2Fchunkeey.git

adb: fix build breakage on recent musl

Fix build breakage as upstream has removed implicit include of
sys/sysmacros.h from sys/types.h:

 remove implicit include of sys/sysmacros.h from sys/types.h

 this reverts commit f552c792c7ce5a560f214e1104d93ee5b0833967, which
 exposed the sysmacros.h macros (device major/minor calculations) for
 BSD and GNU profiles to mimic an unintentional glibc behavior some
 code depended on. glibc has deprecated and since removed them as the
 resolution to bug #19239, so it makes no sense for us to keep this
 behavior. affected code should all have been fixed by now, and if it's
 not yet fixed it needs to be for use with modern glibc anyway.

Ref: https://git.musl-libc.org/cgit/musl/commit/include/sys/types.h?id=a31a30a0076c284133c0f4dfa32b8b37883ac930
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 79596f782e2c8daa1ebb8e480b6373c8142714c6)
---

diff --git a/package/utils/adb/patches/003-fix-musl-build.patch b/package/utils/adb/patches/003-fix-musl-build.patch
new file mode 100644
index 0000000000..8a974b130e
--- /dev/null
+++ b/package/utils/adb/patches/003-fix-musl-build.patch
@@ -0,0 +1,10 @@
+--- a/adb/usb_linux.c
++++ b/adb/usb_linux.c
+@@ -21,6 +21,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <dirent.h>
+ #include <fcntl.h>