From patchwork Fri Jul 16 01:31:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 31443 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B48CB27BC78; Fri, 16 Jul 2021 02:33:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 29B8D27BC6B for ; Fri, 16 Jul 2021 02:33:22 +0100 (BST) Received: from localhost ([::1]:45422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4CjB-0002fA-8M for patchwork@mira.cbaines.net; Thu, 15 Jul 2021 21:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4Cit-0002eg-3s for guix-patches@gnu.org; Thu, 15 Jul 2021 21:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4Cis-0000MW-Se for guix-patches@gnu.org; Thu, 15 Jul 2021 21:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4Cis-0003iU-9v for guix-patches@gnu.org; Thu, 15 Jul 2021 21:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49565] [PATCH core-updates] gnu: bootstrap: Use %current-target-system to decide bootstrap path References: <20210715004613.763843-1-bauermann@kolabnow.com> In-Reply-To: <20210715004613.763843-1-bauermann@kolabnow.com> Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 01:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49565 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49565@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 49565-submit@debbugs.gnu.org id=B49565.162639914214239 (code B ref 49565); Fri, 16 Jul 2021 01:33:02 +0000 Received: (at 49565) by debbugs.gnu.org; 16 Jul 2021 01:32:22 +0000 Received: from localhost ([127.0.0.1]:50116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4CiE-0003hb-Bz for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:32:22 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:61400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Ci9-0003hK-79 for 49565@debbugs.gnu.org; Thu, 15 Jul 2021 21:32:20 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id B9CBEBED for <49565@debbugs.gnu.org>; Fri, 16 Jul 2021 03:32:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1626399128; x=1628213529; bh=OtXl41W116V8jSQis3oT4Mf5EXWIa4BQnMArzn1PMR8=; b=Go+GRE3Qozui p2Oi3v1NeSGb/SBwvDdl055g1/J7x1lW8s3gkNTwUYMc4B9FNIhWHnzKAZgceRXS dWMlh/3bqn/ad891G5gnuvavjwjykQMhFW3qogBLyrmaYxg8y4Cf4Vo5U0CJg/CM bRyUiGjr84qAsiCpbxHnGsVySDV87gHudZr3UAsoGTP8vMSAtkYnHmYsDSuIyt1A 0BZid8zpPhasWKvC8z5jsZvzilfrFYg00YRQOUMnBD3ysrKIqydKf4owXerXzGjg ELEZqUryDXFh9leHAiTtcEctBEN63w+GtM6imkJogk5dctKJKeMS79RoaMQZ2icb 0J/BMHCfrl5yQxeQ7d8nrthasLeG2r5tBbbYz3E2wnAlPzTAHMU19MC6dQ/91GJD W2zpcAzwbuL2+5P0dtYKvCFXnxpXvosEoLxohd/3a+JG+oKSyNF62L51ZR+Ci5NU I9vsKdFDhB/pElf6O9x1zkwlhxUkXF9lpAmZk0i/n0/vFfTco1CRFBycB3CAuNtm tnkS+M/0rdHa6pwe7OEq1R0LGaW0jGxBoWW9DDWM3zdejnuk3cxZNcHNOWdQHE8s uLocQ3PHcbshtD9JqZJNL6ZkHeOvZ8AXN7EXz4qaDSexb/gcdHZuwgH2pt+Nn2Ea xy7jyZko2yEiDwoJ6wkyxyE4S3a2YwQ= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qDMhejDfnkie for <49565@debbugs.gnu.org>; Fri, 16 Jul 2021 03:32:08 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id A0C68B25 for <49565@debbugs.gnu.org>; Fri, 16 Jul 2021 03:32:07 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx002.mykolab.com (Postfix) with ESMTPS id C24EE51FB; Fri, 16 Jul 2021 03:32:06 +0200 (CEST) Date: Thu, 15 Jul 2021 22:31:43 -0300 Message-Id: <20210716013143.901859-1-bauermann@kolabnow.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches When cross-building a non-x86 gcc-toolchain on an x86 machine, ‘%current-target’ has the x86 system value and Guix tries to use the mesboot packages for the bootstrap – which don't work because they’re currently x86-only. Therefore look at ‘%current-target-system’ first, which has the non-x86 system value. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Check ‘%current-target-system’ before ‘%current-system’ to decide whether to use the mesboot path. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): Ditto. --- gnu/packages/bootstrap.scm | 2 +- gnu/packages/commencement.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Hi, As Maxime Devos mentined previously, glibc-mesboot is only supported on i686-linux and x86_64-linux and not powerpc64le-linux so it’s strange that it’s being built on my system. Investigating further, I believe the the problem is the one described on the commit message above. With the patch applied on core-updates, I can now get the same error that the CI is getting when trying to cross-compile a gcc-toolchain package, as seen here: https://ci.guix.gnu.org/build/667452/details But I can’t explain why I see this problem on my machine while it doesn’t happen on the CI one. Perhaps because I’m running Guix on a foreign distro (Ubuntu), while the CI presumably uses Guix System? Here are the derivations that are built now: --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build \ --target=powerpc64le-linux-gnu \ gcc-toolchain@11 substitute: atualizando substitutos de "https://ci.guix.gnu.org"... 100.0% substitute: atualizando substitutos de "https://bordeaux.guix.gnu.org"... 100.0% The following derivations will be built: /gnu/store/3smglg4didq9bizfa6mpgr3mwyl025bg-gcc-toolchain-11.1.0.drv /gnu/store/bqs0df2b3zalz3f6cs3blx3r13f8agwx-linux-libre-headers-5.10.35.drv /gnu/store/adi4bagfjzja2cy0xd4zsjrhrx4l8zzh-gcc-bootstrap-0.drv /gnu/store/lw6xvva92vb6yrg5s73c6m507mmg4wpn-gcc-11.1.0.drv /gnu/store/qm1lgdvlc6wkch2z6qiglqgfjrc9dl52-binutils-2.36.1.drv /gnu/store/23fsjsynp3ryb6npgiipx327ag7dd394-file-boot0-5.39.drv /gnu/store/m69xqa8k199gnphplml2pc4qbl0w07pj-make-boot0-4.3.drv /gnu/store/35v7glpl1p0sbkmyyls4nlcvfdq80bp4-findutils-boot0-4.8.0.drv /gnu/store/3lsjr0fpxx07h7kz42sqqkgqi76wr92w-diffutils-boot0-3.7.drv /gnu/store/8v38wv9nd9wa1v0xmb38la68pck43xsr-sed-boot0-4.8.drv /gnu/store/dxkjjafij00vda2a515clxq2s75l0pxy-patch-boot0-2.7.6.drv /gnu/store/g7zi4asrxwqjy2zskgisw098vs49smhn-tar-boot0-1.34.drv /gnu/store/k4p3hhphaw59afaxrhyzc58041736qp9-gawk-boot0-5.1.0.drv /gnu/store/qr4hzgwji76cr18c2b4ii10wciyplis3-coreutils-boot0-8.32.drv /gnu/store/r16wrs5pfad62pp104m58d6z3r010mq6-glibc-2.33.drv /gnu/store/crdznbwd3dq9xrmrxzjk1jl80fb2d1ws-gcc-cross-boot0-10.3.0.drv /gnu/store/i337vhnb6gh510s0cprbww1l3qila759-libstdc++-boot0-4.9.4.drv /gnu/store/vvkqxj9c4710jajddrqd7qbq1vhy1b2q-bzip2-boot0-1.0.8.drv /gnu/store/wry17xmsdh3dg33f4397a609kix5492q-binutils-cross-boot0-2.36.1.drv /gnu/store/f2yibv3n2ya2s2hcv2n103bmfb39q0q1-bash-static-5.1.8.drv /gnu/store/rn9xwjxjxdr6chwr5bdm0law300120yj-ld-wrapper-boot0-0.drv /gnu/store/vnaw38hssdshzsy17vmmy7x7zh3ni7zi-glibc-intermediate-2.33.drv /gnu/store/qzhgyd8qnwhy46ajsr1156zap6sryxvf-ld-wrapper-0.drv /gnu/store/5g8dn0w3k3m2famxndzxywxl6v3r79cm-libunistring-0.9.10.drv /gnu/store/0ycvzp0zmlqac5k3b32a7kb9y5z8sz09-gcc-10.3.0.drv /gnu/store/dh10c2zsxyv0i3j43q81xfmkhsnh03sh-libstdc++-10.3.0.drv /gnu/store/xwifg8mb9zh0azyxccls9q6gcb56p14h-ld-wrapper-boot3-0.drv /gnu/store/yljl3dspmzk6256sdl56swsq2r694nsi-zlib-1.2.11.drv /gnu/store/w87mmrp0c5irjmqhjj76m27i39zgj3xf-bash-minimal-5.1.8.drv /gnu/store/aag6c2sy2w3xyzs4nm0nfwsqw9c1xkvi-libgc-8.0.4.drv /gnu/store/vvljjz5dj38yqfd813z6z6xmwsk32jbg-libatomic-ops-7.6.10.drv /gnu/store/k4rzmyxidag567qvf7rkpwl0h041vczm-guile-3.0.7.drv /gnu/store/d608rkzh04rlaivcm9y0hsj4icanhdyp-libffi-3.3.drv /gnu/store/r16wrs5pfad62pp104m58d6z3r010mq6-glibc-2.33.drv --8<---------------cut here---------------end--------------->8--- diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 5a8028a4652c..b14dc63062e8 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -927,7 +927,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. - (match (%current-system) + (match (or (%current-target-system) (%current-system)) ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fb028390a260..2af3dead3c73 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2396,7 +2396,7 @@ exec " gcc "/bin/" program (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux, x86_64-linux ;; Scheme-only bootstrap the actual reduced set with bootstrapped toolchain. - (match (%current-system) + (match (or (%current-target-system) (%current-system)) ((or "i686-linux" "x86_64-linux") (%boot-mesboot6-inputs)) (_