[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/17: gnu: hostapd: Cross compile.
From: |
guix-commits |
Subject: |
07/17: gnu: hostapd: Cross compile. |
Date: |
Mon, 16 Nov 2020 08:12:37 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit afcf90c60f8a39cfe34bd796f91dde8d1e6e5da2
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Nov 16 12:32:24 2020 +0200
gnu: hostapd: Cross compile.
* gnu/packages/admin.scm (hostapd)[arguments]: Use cc-for-target in
make-flags. Add custom flag to use correct pkg-config for target.
---
gnu/packages/admin.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 88d0a79..f18abcc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1723,10 +1723,10 @@ command.")
"1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda _
;; This is mostly copied from 'wpa-supplicant' above.
(chdir "hostapd")
(copy-file "defconfig" ".config")
@@ -1738,6 +1738,14 @@ command.")
CONFIG_IEEE80211AC=y\n" port)
(close-port port))
#t))
+ (add-after 'unpack 'patch-pkg-config
+ (lambda _
+ (substitute* "src/drivers/drivers.mak"
+ (("pkg-config")
+ (or (which "pkg-config")
+ (string-append ,(%current-target-system)
+ "-pkg-config"))))
+ #t))
(add-after 'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -1754,7 +1762,7 @@ command.")
(find-files "." "\\.8"))
#t))))
- #:make-flags (list "CC=gcc"
+ #:make-flags (list (string-append "CC=" ,(cc-for-target))
(string-append "BINDIR=" (assoc-ref %outputs "out")
"/sbin")
(string-append "LIBDIR=" (assoc-ref %outputs "out")
- branch master updated (f6a42ac -> 455daf4), guix-commits, 2020/11/16
- 01/17: gnu: rgbds: Cross compile., guix-commits, 2020/11/16
- 02/17: gnu: filteraudio: Cross compile., guix-commits, 2020/11/16
- 04/17: gnu: btar: Cross compile., guix-commits, 2020/11/16
- 06/17: gnu: masscan: Cross compile., guix-commits, 2020/11/16
- 09/17: gnu: unifdef: Cross compile., guix-commits, 2020/11/16
- 05/17: gnu: mktorrent: Cross compile., guix-commits, 2020/11/16
- 10/17: gnu: premake4: Cross compile., guix-commits, 2020/11/16
- 07/17: gnu: hostapd: Cross compile.,
guix-commits <=
- 12/17: gnu: bam: Cross-compile., guix-commits, 2020/11/16
- 13/17: gnu: lz4: Cross compile., guix-commits, 2020/11/16
- 14/17: gnu: squashfs-tools: Cross compile., guix-commits, 2020/11/16
- 17/17: gnu: pzstd: Cross compile., guix-commits, 2020/11/16
- 03/17: gnu: dcadec: Cross compile., guix-commits, 2020/11/16
- 08/17: gnu: dtc: Cross compile., guix-commits, 2020/11/16
- 11/17: gnu: lua: Cross compile., guix-commits, 2020/11/16
- 15/17: gnu: bsdiff: Cross compile., guix-commits, 2020/11/16
- 16/17: gnu: zstd: Cross compile., guix-commits, 2020/11/16