From 5ff6e06763fb5df48465298588a2920ae84c5a3a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 19:26:01 +0100 Subject: gnu: adb: Fix FTBFS with Glibc 2.28. * gnu/packages/android.scm (adb)[arguments]: Add phase 'glibc-compat'. --- gnu/packages/android.scm | 7 +++++++ 1 file changed, 7 insertions(+) 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 " all) + (string-append all "\n#include \n"))) + #t)) (add-after 'enter-source 'make-libs-available (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "Android.mk" -- cgit v1.2.3