From 8c0751505be23640c6a789e10c9be3982be16d80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 15 Dec 2020 12:28:36 +0200 Subject: [PATCH] gnu: iproute: Fix cross compiling. * gnu/packages/linux.scm (iproute)[arguments]: Set CC and HOSTCC in make-flags. Add custom phase to replace the value for PKG_CONFIG in hand-written configure script. --- gnu/packages/linux.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0e9932785d..f76590ec96 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2299,6 +2299,8 @@ that the Ethernet protocol is much simpler than the IP protocol.") #:tests? #f #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "DESTDIR=" + (string-append "CC=" ,(cc-for-target)) + "HOSTCC=gcc" (string-append "BASH_COMPDIR=" out "/etc/bash_completion.d") (string-append "LIBDIR=" out "/lib") @@ -2314,7 +2316,16 @@ that the Ethernet protocol is much simpler than the IP protocol.") ;; Don't attempt to create /var/lib/arpd. (substitute* "Makefile" (("^.*ARPDDIR.*$") "")) - #t))))) + #t)) + (add-after 'unpack 'patch-configure + (lambda _ + (let ((target ,(%current-target-system))) + (substitute* "configure" + (("pkg-config") + (if target + (string-append target "-pkg-config") + "pkg-config"))) + #t)))))) (inputs `(("db4" ,bdb) ("iptables" ,iptables)