nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: adb: Fix FTBFS with Glibc 2.28. 

* gnu/packages/android.scm (adb)[arguments]: Add phase 'glibc-compat'.
This commit is contained in:
Marius Bakke 2018-11-24 19:26:01 +01:00
parent 45bc4b7ecb
commit 5ff6e06763
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/android.scm
View File

@ -339,6 +339,13 @@ various Android core host applications.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-source (add-after 'unpack 'enter-source
(lambda _ (chdir "adb") #t)) (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 (add-after 'enter-source 'make-libs-available
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Android.mk" (substitute* "Android.mk"