amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cross-kernel-headers: Fix build.

Browse source 
This fixes a regression introduced in
0e2251fcf8, 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.
This commit is contained in:
Marius Bakke 2021-05-09 12:44:08 +02:00
parent a605ef3ce9
commit 3cf1afb7e7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/cross-base.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Carl Dong <contact@carldong.me> ;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
@ -341,15 +341,18 @@ target that libc."
`(#:implicit-cross-inputs? #f `(#:implicit-cross-inputs? #f
,@(package-arguments linux-headers)) ,@(package-arguments linux-headers))
((#:phases phases) ((#:phases phases)
`(alist-replace `(modify-phases ,phases
'build (replace 'build
(lambda _ (lambda _
(setenv "ARCH" ,(system->linux-architecture target)) (setenv "ARCH" ,(system->linux-architecture target))
(format #t "`ARCH' set to `~a' (cross compiling)~%" (getenv "ARCH")) (format #t "`ARCH' set to `~a' (cross compiling)~%"
(getenv "ARCH"))
(invoke "make" ,(system->defconfig target)) (invoke "make" ,(system->defconfig target))
(invoke "make" "mrproper" "headers_check")) (invoke "make" "mrproper"
,phases)))) ,@(if (version>=? (package-version linux-headers) "5.3")
'("headers")
'("headers_check")))))))))
(native-inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils) ("cross-binutils" ,xbinutils)
,@(package-native-inputs linux-headers))))) ,@(package-native-inputs linux-headers)))))