aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-11-24 19:26:01 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-11-24 19:26:01 +0100
commit5ff6e06763fb5df48465298588a2920ae84c5a3a (patch)
tree6dd3036a139738911c2c0c3da1d142bd916e340e /gnu/packages
parent45bc4b7ecb1a5a2aef379a36f20fc74ba3c5b10b (diff)
downloadgnu-guix-5ff6e06763fb5df48465298588a2920ae84c5a3a.tar
gnu-guix-5ff6e06763fb5df48465298588a2920ae84c5a3a.tar.gz
gnu: adb: Fix FTBFS with Glibc 2.28.
* gnu/packages/android.scm (adb)[arguments]: Add phase 'glibc-compat'.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/android.scm7
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 9f8d850ff5..e41beee85f 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -339,6 +339,13 @@ various Android core host applications.")
(modify-phases %standard-phases
(add-after 'unpack 'enter-source
(lambda _ (chdir "adb") #t))
+ (add-after 'enter-source 'glibc-compat
+ (lambda _
+ ;; Include sysmacros.h for "major" and "minor" in Glibc 2.28.
+ (substitute* "usb_linux.cpp"
+ (("#include <sys/types.h>" all)
+ (string-append all "\n#include <sys/sysmacros.h>\n")))
+ #t))
(add-after 'enter-source 'make-libs-available
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Android.mk"