Pierre Langlois writes: >> And if I remove it then the error goes away! The build hasn't finished >> yet for me, but it's gone past the offending xor-neon.c file so we >> /should/ be good. >> >> I'm not really sure why though, do you know why this phase was required >> at the time? I haven't tested that linux-libre still builds on x86 with >> this phase removed yet, trying it now. > > OK, I've now built kernels with the attached patch on the kernel-updates > branch for x86_64 and aarch64! I've also tested with > --system=armhf-linux on the softiron and --system=i868-linux on my x86 > desktop, it all looks good!
> * gnu/packages/linux.scm (make-linux-libre)[arguments]: Remove > 'work-around-gcc-7-include-path-issue phase. > --- > gnu/packages/linux.scm | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index 41991c9e45..d63755d791 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -35,6 +35,7 @@ > ;;; Copyright © 2019 Tim Gesthuizen <[email protected]> > ;;; Copyright © 2019 Maxim Cournoyer <[email protected]> > ;;; Copyright © 2019 Stefan Stefanović <[email protected]> > +;;; Copyright © 2019 Pierre Langlois <[email protected]> Whoops, I hadn't realized I had edited this file before, see attached for a fixed patch.
>From 1f855451dfd4c3068eebcc09cacf79bb6df97cc8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois <[email protected]> Date: Sun, 14 Jul 2019 12:47:06 +0100 Subject: [PATCH] gnu: linux-libre: Fix build on aarch64. * gnu/packages/linux.scm (make-linux-libre)[arguments]: Remove 'work-around-gcc-7-include-path-issue phase. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 41991c9e45..c1a5bbebc0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby <[email protected]> ;;; Copyright © 2018 Brendan Tildesley <[email protected]> ;;; Copyright © 2018 Manuel Graf <[email protected]> -;;; Copyright © 2018 Pierre Langlois <[email protected]> +;;; Copyright © 2018, 2019 Pierre Langlois <[email protected]> ;;; Copyright © 2018 Vasile Dumitrascu <[email protected]> ;;; Copyright © 2019 Tim Gesthuizen <[email protected]> ;;; Copyright © 2019 Maxim Cournoyer <[email protected]> @@ -355,11 +355,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (substitute* (find-files "." "^Makefile(\\.include)?$") (("/bin/pwd") "pwd")) #t)) - (add-before 'configure 'work-around-gcc-7-include-path-issue - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) ;; Avoid introducing timestamps -- 2.22.0
