aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2020-06-30 15:04:17 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2020-06-30 15:08:49 +0200
commita7eaaec8c147b099ea9b85d64ef2ba4a3f710b5c (patch)
treed5bafd70a303fdec5ee7b4fcaa34f7317690db0e
parent5e766fe5a2b19a33e1f2589ede37da674aada4c6 (diff)
downloadguix-a7eaaec8c147b099ea9b85d64ef2ba4a3f710b5c.tar.gz
guix-a7eaaec8c147b099ea9b85d64ef2ba4a3f710b5c.zip
gnu: busybox: Accept make-flags.
* gnu/packages/busybox.scm (busybox)[arguments]<#:phases>[configure]: Accept MAKE-FLAGS and use them. [check]: Accept MAKE-FLAGS and use them. [install]: Accept MAKE-FLAGS and use them.
-rw-r--r--gnu/packages/busybox.scm15
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index 305a61f40b..0a93c6475e 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -60,7 +60,8 @@
(("default y") "default n"))
#t))
(replace 'configure
- (lambda _ (invoke "make" "defconfig")))
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "defconfig" make-flags)))
(add-after 'configure 'dont-install-to-usr
(lambda _
(substitute* ".config"
@@ -68,7 +69,7 @@
"CONFIG_INSTALL_NO_USR=y"))
#t))
(replace 'check
- (lambda _
+ (lambda* (#:key make-flags #:allow-other-keys)
(substitute* '("testsuite/du/du-s-works"
"testsuite/du/du-works")
(("/bin") "/etc")) ; there is no /bin but there is a /etc
@@ -96,17 +97,17 @@
(delete-file "testsuite/which/which-uses-default-path")
(rmdir "testsuite/which")
- (invoke "make"
+ (apply invoke "make"
;; "V=1"
"SKIP_KNOWN_BUGS=1"
"SKIP_INTERNET_TESTS=1"
- "check")))
+ "check" make-flags)))
(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key outputs make-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (invoke "make"
+ (apply invoke "make"
(string-append "CONFIG_PREFIX=" out)
- "install")))))))
+ "install" make-flags)))))))
(native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man)
;; The following are needed by the tests.
("inetutils" ,inetutils)