mbakke pushed a commit to branch core-updates
in repository guix.
commit 3cf1afb7e7249992b2db2f4f00899fd22237e89a
Author: Marius Bakke <[email protected]>
AuthorDate: Sun May 9 12:44:08 2021 +0200
gnu: cross-kernel-headers: Fix build.
This fixes a regression introduced in
0e2251fcf8189a4f642074d3aa898221b29c3a55, as "make headers_check" does not
actually build the headers in newer versions, instead "make headers_install"
built them as a side effect.
* gnu/packages/cross-base.scm (cross-kernel-headers)[arguments]: Adjust
build
phase to call the correct Make target. While at it, migrate to
MODIFY-PHASES.
---
gnu/packages/cross-base.scm | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 6df3696..9487ac9 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <[email protected]>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <[email protected]>
;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2019, 2020 Marius Bakke <[email protected]>
+;;; Copyright © 2019, 2020, 2021 Marius Bakke <[email protected]>
;;; Copyright © 2019 Carl Dong <[email protected]>
;;; Copyright © 2020 Mathieu Othacehe <[email protected]>
;;;
@@ -341,15 +341,18 @@ target that libc."
`(#:implicit-cross-inputs? #f
,@(package-arguments linux-headers))
((#:phases phases)
- `(alist-replace
- 'build
- (lambda _
- (setenv "ARCH" ,(system->linux-architecture target))
- (format #t "`ARCH' set to `~a' (cross compiling)~%" (getenv
"ARCH"))
-
- (invoke "make" ,(system->defconfig target))
- (invoke "make" "mrproper" "headers_check"))
- ,phases))))
+ `(modify-phases ,phases
+ (replace 'build
+ (lambda _
+ (setenv "ARCH" ,(system->linux-architecture target))
+ (format #t "`ARCH' set to `~a' (cross compiling)~%"
+ (getenv "ARCH"))
+
+ (invoke "make" ,(system->defconfig target))
+ (invoke "make" "mrproper"
+ ,@(if (version>=? (package-version linux-headers)
"5.3")
+ '("headers")
+ '("headers_check")))))))))
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
,@(package-native-inputs linux-headers)))))
