From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:52775)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i5UmV-0003P4-5a
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:53:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i5UmT-0003cm-Tr
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:53:02 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:52187)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1i5UmT-0003ci-Q0
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:53:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i5UmT-0005Kf-MZ
 for guix-patches@gnu.org; Wed, 04 Sep 2019 08:53:01 -0400
Subject: [bug#36477] [PATCH v3 23/48] gnu: make-linux-libre: Fix
 cross-compilation.
Resent-Message-ID: <handler.36477.B36477.156760153220438@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <20190902153333.11190-1-m.othacehe@gmail.com>
 <20190902153333.11190-24-m.othacehe@gmail.com>
Date: Wed, 04 Sep 2019 14:52:03 +0200
In-Reply-To: <20190902153333.11190-24-m.othacehe@gmail.com> (Mathieu
 Othacehe's message of "Mon, 2 Sep 2019 17:33:08 +0200")
Message-ID: <87mufk2pho.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: 36477@debbugs.gnu.org

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> * gnu/packages/linux.scm (make-linux-libre)[arguments]: Unset CROSS_CPATH=
 to
> make sure that cross-libc is not found. Otherwise, some of its header wou=
ld
> conflict with the one from linux (stdint.h and linux/types.h).
> ---
>  gnu/packages/linux.scm | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index afa860830b..9c1ba6d5b9 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -665,6 +665,9 @@ for ARCH and optionally VARIANT, or #f if there is no=
 such configuration."
>           (replace 'configure
>             (lambda* (#:key inputs native-inputs target #:allow-other-key=
s)
>               ;; Avoid introducing timestamps
> +             ,@(if (%current-target-system)
> +                   '((unsetenv "CROSS_CPATH"))
> +                   '())
>               (setenv "KCONFIG_NOTIMESTAMP" "1")

Could you move the comment about timestamps right above
KCONFIG_NOTIMESTAMP, and turn the explanation about CROSS_CPATH that you
put in the commit log into a comment above CROSS_CPATH?

OK with these changes, thanks!

Ludo=E2=80=99.