[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: adb: Fix FTBFS with Glibc 2.28.
From: |
guix-commits |
Subject: |
01/02: gnu: adb: Fix FTBFS with Glibc 2.28. |
Date: |
Sat, 24 Nov 2018 13:34:10 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 5ff6e06763fb5df48465298588a2920ae84c5a3a
Author: Marius Bakke <address@hidden>
Date: Sat Nov 24 19:26:01 2018 +0100
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 9f8d850..e41beee 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"