ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: busybox: Accept make-flags.

Browse source 
* 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.
This commit is contained in:
Danny Milosavljevic 2020-06-30 15:04:17 +02:00
parent 5e766fe5a2
commit a7eaaec8c1
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/busybox.scm
View file

@ -60,7 +60,8 @@ (define-public busybox
(("default y") "default n")) (("default y") "default n"))
#t)) #t))
(replace 'configure (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 (add-after 'configure 'dont-install-to-usr
(lambda _ (lambda _
(substitute* ".config" (substitute* ".config"
@ -68,7 +69,7 @@ (define-public busybox
"CONFIG_INSTALL_NO_USR=y")) "CONFIG_INSTALL_NO_USR=y"))
#t)) #t))
(replace 'check (replace 'check
(lambda _ (lambda* (#:key make-flags #:allow-other-keys)
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"
"testsuite/du/du-works") "testsuite/du/du-works")
(("/bin") "/etc")) ; there is no /bin but there is a /etc (("/bin") "/etc")) ; there is no /bin but there is a /etc
@ -96,17 +97,17 @@ (define-public busybox
(delete-file "testsuite/which/which-uses-default-path") (delete-file "testsuite/which/which-uses-default-path")
(rmdir "testsuite/which") (rmdir "testsuite/which")
(invoke "make" (apply invoke "make"
;; "V=1" ;; "V=1"
"SKIP_KNOWN_BUGS=1" "SKIP_KNOWN_BUGS=1"
"SKIP_INTERNET_TESTS=1" "SKIP_INTERNET_TESTS=1"
"check"))) "check" make-flags)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs make-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(invoke "make" (apply invoke "make"
(string-append "CONFIG_PREFIX=" out) (string-append "CONFIG_PREFIX=" out)
"install"))))))) "install" make-flags)))))))
(native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man) (native-inputs `(("perl" ,perl) ; needed to generate the man pages (pod2man)
;; The following are needed by the tests. ;; The following are needed by the tests.
("inetutils" ,inetutils) ("inetutils" ,inetutils)