me/guix
Archived
1
0
Fork 0
Code Activity

gnu: toybox: Use #:make-flags.

Browse source 
* gnu/packages/busybox.scm (toybox)[arguments]: Add #:make-flags to
replace ad hoc use of environment variables and custom phases.
Remove the 'set-environment-variables and custom 'install phase.
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-22 02:00:00 +02:00
parent b55d0f553b
commit 38787e36c1
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/busybox.scm
View file

@ -131,14 +131,15 @@ any small or embedded system.")
"150lvp7hf9ndafvmr42kb8xi86hxjd2zj4binwwhgjw2dwrvy25m")))) "150lvp7hf9ndafvmr42kb8xi86hxjd2zj4binwwhgjw2dwrvy25m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:phases (list #:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "HOSTCC=gcc")
(string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'set-environment-variables
(lambda _
(setenv "CC" #$(cc-for-target))
(setenv "HOSTCC" (which "gcc"))))
(replace 'configure (replace 'configure
(lambda _ (invoke "make" "defconfig"))) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "defconfig" make-flags)))
(add-before 'check 'fix-or-skip-broken-tests (add-before 'check 'fix-or-skip-broken-tests
(lambda _ (lambda _
;; Some tests expect $USER to magically be the current user. ;; Some tests expect $USER to magically be the current user.
@ -148,11 +149,6 @@ any small or embedded system.")
;; Delete tests that expect a root or 0 user to exist. ;; Delete tests that expect a root or 0 user to exist.
(substitute* "tests/id.test" (substitute* "tests/id.test"
(("^testing .*[ \\(]root.*") "")))) (("^testing .*[ \\(]root.*") ""))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make"
(string-append "PREFIX=" #$output)
"install")))
(add-after 'install 'remove-usr-directory (add-after 'install 'remove-usr-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively (string-append #$output "/usr"))))) (delete-file-recursively (string-append #$output "/usr")))))