gnu: adb: Fix FTBFS with Glibc 2.28.

* gnu/packages/android.scm (adb)[arguments]: Add phase 'glibc-compat'.
2018-11-24 19:26:01 +01:00 · 2018-11-24 19:26:01 +01:00 · 5ff6e06763
parent 45bc4b7ecb
commit 5ff6e06763
1 changed files with 7 additions and 0 deletions
--- 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"