From patchwork Tue Mar 16 06:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27865 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 5525727BC52; Tue, 16 Mar 2021 06:47:16 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 3E7C227BC54 for ; Tue, 16 Mar 2021 06:47:13 +0000 (GMT) Received: from localhost ([::1]:52824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3U0-0002Ji-CJ for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Tq-0002JU-IH for guix-patches@gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Tq-0004uQ-AD for guix-patches@gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Tq-0001a3-30 for guix-patches@gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 01/18] gnu: bootstrap: Add support for powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158771645980 (code B ref 47182); Tue, 16 Mar 2021 06:47:02 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:46:04 +0000 Received: from localhost ([127.0.0.1]:37877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Sp-0001Xm-BX for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:46:04 -0400 Received: from mail-pj1-f52.google.com ([209.85.216.52]:38603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Sk-0001XW-Aq for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:45:58 -0400 Received: by mail-pj1-f52.google.com with SMTP id k23-20020a17090a5917b02901043e35ad4aso802254pji.3 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=21/3PY6b/VapfHJ7/CG6VRHaVoV26oH7QOBDWaSVr0U=; b=n3nytyXGVrB7W5NbI06LWjqhC1zdj2Snnk2pSaxziWHeLbEgKWfsWUpQYdkFC2bVR8 s2cRd9EhZx7HvKvmFpYpo1ffhyE1CTO+LMabJ/GG+k70uFrY9nNU/mLFJgzli20B1PRL 1AHvjec7/4WvWvmMM+oQ6y9GFVpACOJHi0julD4LH0wZ6SCC1oHmoUMxlhE0pam464KB KB+w3ZQu36Vte/vPAF+urpUgWV9Pn2POHpGFf5fzbEba1LWZr4ELGNOqLWazsdaj+EEk fUfm8Z/GtKP4gWTb70uP1Z2NGKrgAwSpD8EMcUbJSMWAHwOiTFdLctofJiWZgs2sYWOQ pMLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=21/3PY6b/VapfHJ7/CG6VRHaVoV26oH7QOBDWaSVr0U=; b=ZBaxT7HY5UCCgdIJ1DI1bNVBB1q+1vR9EbL/w4ZtG8XO5f0oqaonTQsYCsmes0ZxLm 4+Pv+iC5sNCWsBeM3o7vZTF/+DAqpZ2VCYD6yrbu+H78g2jhNeelS/uIVPYLXAtn+Ss2 kV+rrW/dDV6/B3Y8uWD+U2hyczAZJWhGmI5NV4hP8y/Y/NywXRW7meofv7lCironaA4K RZhNa3YI0nLZcH0ZNUCEU8dWbT6ztl1eIglz7InKpjRpqOW4q84UzFx+Mbtm+kH7E3hc YDVufs5TfMd1vbIjfSZuLPkz2oZuvPmGyLyaDLa1k8/rANLncrwhLQ/wEd3hjY4rtt42 6+Vg== X-Gm-Message-State: AOAM531YgcE02Al3gFGKDs2zrspQ9npNMrgdnjovCeBT2zIHpbmEjQ9B eDBNOEPTWYExC7+bjqDf25XvC3lIABf2UQ== X-Google-Smtp-Source: ABdhPJwqypCE+KjJYMX/AerFB5ZPemTGMksUFBbymCDyC5eYmtG9BFyh2hZRLtqTDfAPHvhaSmCEbg== X-Received: by 2002:a17:90b:3716:: with SMTP id mg22mr3213790pjb.157.1615877147764; Mon, 15 Mar 2021 23:45:47 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.45.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:45:47 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:54 -0700 Message-Id: <20210316064511.2891553-1-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316062805.2890883-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches The bootstrap tarballs used by these bootstrap packages were created via the following steps: - Create a new x86_64 VM using QEMU. - Use https://ftp.gnu.org/gnu/guix/guix-system-install-1.2.0.x86_64-linux.iso.xz to install Guix System 1.2.0 in the VM. - Run: guix pull --no-substitutes --commit=662e7e28d576ada91fc9dec7d27c100666114f03 - Run: guix build --no-substitutes --target=powerpc64le-linux-gnu bootstrap-tarballs With the exception of gcc-static, all bootstrap binaries contained in these tarballs can be built reproducibly. Unfortunately, gcc-static is not always reproducible when everything is built from source on separate machines. Despite investigation efforts, the cause remains unclear, so we have decided to move forward with these binaries to unblock further bootstrapping work. For details, see . * gnu/packages/bootstrap.scm (%bootstrap-executables) (bootstrap-executable-file-name, bootstrap-guile-url-path) (bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils) (%bootstrap-glibc, %bootstrap-gcc): Add entries for powerpc64le-linux. (%bootstrap-executable-base-urls): Add an entry for alpha.gnu.org. --- gnu/packages/bootstrap.scm | 39 +++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c39e60ec8bc..c598cedc0ae 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -5,6 +5,8 @@ ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter +;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,16 +124,27 @@ ("tar" ,(base32 "06gmqdjq3rl8lr47b9fyx4ifnm5x56ymc8lyryp1ax1j2s4y5jb4")) ("xz" - ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))))) + ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))) + ("powerpc64le-linux" + ("bash" + ,(base32 "1kiw7n6mkdy2x9in97646nb7aiayxr090ws1hbrlazah3fjqi6nj")) + ("mkdir" + ,(base32 "04dpvi231zcl40ig048vqqnyvmnkw1byrm1q1qqvs1f0g16yhrrk")) + ("tar" + ,(base32 "150c8948cz8r208g6qgn2dn4f4zs5kpgbpbg6bwag6yw42rapw2l")) + ("xz" + ,(base32 "0v5738idy9pqzcbrjdpxi5c6qs5m78zrpsydmrpx5cfcfzbkxzjh"))))) (define %bootstrap-executable-base-urls ;; This is where the bootstrap executables come from. '("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" + "https://alpha.gnu.org/gnu/guix/bootstrap/" "http://lilypond.org/janneke/guix/")) (define (bootstrap-executable-file-name system program) "Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM." (match system + ("powerpc64le-linux" (string-append system "/20210106/" program)) ("i586-gnu" (string-append system "/20200326/" program)) (_ (string-append system "/" program "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) @@ -332,6 +345,8 @@ or false to signal an error." "/20150101/guile-2.0.11.tar.xz") ("i586-gnu" "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz") + ("powerpc64le-linux" + "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz") (_ "/20131110/guile-2.0.9.tar.xz")))) @@ -346,6 +361,8 @@ or false to signal an error." (base32 "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr")) ("armhf-linux" (base32 "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5")) + ("powerpc64le-linux" + (base32 "1rnyfz5q38jyvxddj617443bnnzql4vw0mxzqpj8wz48wx4bhbq0")) ("aarch64-linux" (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) ("i586-gnu" @@ -479,6 +496,8 @@ $out/bin/guile --version~%" "/20150101/static-binaries.tar.xz") ("aarch64-linux" "/20170217/static-binaries.tar.xz") + ("powerpc64le-linux" + "/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") (_ @@ -498,6 +517,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh")) + ("powerpc64le-linux" + (base32 + "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v")) ("i586-gnu" (base32 "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) @@ -547,6 +569,8 @@ $out/bin/guile --version~%" "/20150101/binutils-2.25.tar.xz") ("aarch64-linux" "/20170217/binutils-2.27.tar.xz") + ("powerpc64le-linux" + "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") (_ @@ -566,6 +590,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n")) + ("powerpc64le-linux" + (base32 + "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz")) ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) @@ -622,6 +649,8 @@ $out/bin/guile --version~%" "/20150101/glibc-2.20.tar.xz") ("aarch64-linux" "/20170217/glibc-2.25.tar.xz") + ("powerpc64le-linux" + "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") (_ @@ -641,6 +670,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) + ("powerpc64le-linux" + (base32 + "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) ("i586-gnu" (base32 "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) @@ -713,6 +745,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/20150101/gcc-4.8.4.tar.xz") ("aarch64-linux" "/20170217/gcc-5.4.0.tar.xz") + ("powerpc64le-linux" + "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") (_ @@ -732,6 +766,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("aarch64-linux" (base32 "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) + ("powerpc64le-linux" + (base32 + "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1")) ("i586-gnu" (base32 "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) From patchwork Tue Mar 16 06:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27864 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 8FF4D27BC52; Tue, 16 Mar 2021 06:47:15 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 6C8B927BC55 for ; Tue, 16 Mar 2021 06:47:13 +0000 (GMT) Received: from localhost ([::1]:52832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3U0-0002KA-Ee for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Tq-0002Jb-Ro for guix-patches@gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Tq-0004uo-KZ for guix-patches@gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Tq-0001aJ-J0 for guix-patches@gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 02/18] utils: Add target-powerpc? procedure. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772216072 (code B ref 47182); Tue, 16 Mar 2021 06:47:02 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:01 +0000 Received: from localhost ([127.0.0.1]:37881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tn-0001Zd-DW for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:01 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:41909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tl-0001ZJ-Qo for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:46:58 -0400 Received: by mail-pj1-f48.google.com with SMTP id nh23-20020a17090b3657b02900c0d5e235a8so928468pjb.0 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5qkcOkMJKiioFFX4dLG593zuTVWYfNIhaVfaXYLVlNo=; b=EU5HmfLakxNlWSQ4Ag1vXoSUczZTjpCf+l8u3aJj6q70rPvBeR7C7btyxEHsO/TQq1 WXHlnkGka1aXeEAE55DoAOdOMpSVueYl4+3Rh+2AkKLxoZlcHJ/bkbYEhHi5xgJ8vygP QWqaYYItzMVVNVdaKV3sliQo5bCDQYgGrGCqv8ajPHucuH0ludXZfiEIH2qq+9uMTDmN cKdlT+bFsym+x+S7t75z1HsfHR4ewfgPpSaT8Y+JyFQeeYc6ckhM3BEkEIhre+X1teLP cxVIB5dPgDTHhbmxcAgEGP2wSEw5CoziJROk0F0/c7Zkt0EU9QitbCYD69dQTXHo9MfV TucA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5qkcOkMJKiioFFX4dLG593zuTVWYfNIhaVfaXYLVlNo=; b=Z9YT99BSil69ZwFPYR0RXhaSgDon7Dy4yHbXG3DjR0wMAwwL5mo/14n8l9MN74LuNX 6HR9mSGnWtbIK3K65qodAaYXrMZYOo7cS166Ld9aR6C26BF8oEde/N6aqu6qPdmbxbmO pFg4pzM5e8MiCK8S4nhWvXlZKe1krNpv+8UJGciJ5uRxz/PkRHd9b3QwwuOLvA3OlDQ2 ua3wFTYgawZS8tdefoYBStQg9G1AhU8VIxNm7Wk7IVIrhGMMeFfwGaoOhrJO6UbLZPxl jxusTISBqBuoX3WM+YYARGGrhGRODiAwBWehzt8e6BQLHIaJM6AtCbCPPoO/YLJEJmIQ J/sA== X-Gm-Message-State: AOAM530ks81pX5NUWrPBaUmHDst4GP6mKKVBTCjwN76iov8SiVJo922D JQPV+5aQna/miWArOkuYS5QdtT6FpsBc0Q== X-Google-Smtp-Source: ABdhPJxSAmS3+cPRGhAAbp2sKonZ1zZZokyzZtyGHhQoYORfyZqkscRFdMbHAtJBhaJBl8oKjQhu6A== X-Received: by 2002:a17:90a:7786:: with SMTP id v6mr3320649pjk.16.1615877211700; Mon, 15 Mar 2021 23:46:51 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:51 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:55 -0700 Message-Id: <20210316064511.2891553-2-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-powerpc?): New exported procedure. --- guix/utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 21e3460b2c7..fc57620319e 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,6 +80,7 @@ target-arm32? target-aarch64? target-arm? + target-powerpc? target-64bit? cc-for-target cxx-for-target @@ -541,6 +543,10 @@ a character other than '@'." (%current-system)))) (or (target-arm32? target) (target-aarch64? target))) +(define* (target-powerpc? #:optional (target (or (%current-target-system) + (%current-system)))) + (string-prefix? "powerpc" target)) + (define* (target-64bit? #:optional (system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))) From patchwork Tue Mar 16 06:44:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27877 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 0919E27BC54; Tue, 16 Mar 2021 06:49:19 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 CC35927BC52 for ; Tue, 16 Mar 2021 06:49:17 +0000 (GMT) Received: from localhost ([::1]:57858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3W1-0004VA-1n for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Up-00035H-4R for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uo-0005X5-AO for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uo-0001f0-7t for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 03/18] gnu: gcc-4.7: On powerpc64le, fix /lib64 references. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772316183 (code B ref 47182); Tue, 16 Mar 2021 06:48:02 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:11 +0000 Received: from localhost ([127.0.0.1]:37889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tq-0001aP-OS for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:10 -0400 Received: from mail-pl1-f174.google.com ([209.85.214.174]:45331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tn-0001ZL-2p for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:46:59 -0400 Received: by mail-pl1-f174.google.com with SMTP id u18so16462636plc.12 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zNpfBPry0SoXUM0sMUVBP0X7EUdP+jNBT7GyoJGIGow=; b=O5mVUvBk9Nfrun2x5Eeo98qY86X0nOlP94lVu3LBdKPzhw8diGgQZKoqrfev4txiGT JuTezZJKUNGlx5RftmEKZ5f224GddoKY76R5O9UVzttZIIa4wVGhvBPqC53xAuuyrRzD fSn1YEo7Cun/QlK0zCBse1VNjDKSdvfw2Mv68EfaNwNmGLTm5tqwhaE48k6MOnTTe8dH 0Fyrc4mqrBNdtLp5pjgYrulQopX09FQe4KNrzTpCAnP2Sf3lGhzGFek2o4FSWW2rsCtF EpglLFnN2JdO9A/pUk0QqmCRWZdi9Mz3zS2u7gZ7jRH07AnEO+9jI/dtLajqj+hh3iYP MKhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zNpfBPry0SoXUM0sMUVBP0X7EUdP+jNBT7GyoJGIGow=; b=myhwL6zhmggT9vF9sb8mpTYNF6L5ODCps9XVaPtwU0VPiIpittehZvB1h128pP1xIg UtQqk814yCDotVcGLr5wj5oXdi40N2NiCcGPNWBF5cY0jISpshfxCUVPJn6w1hds+UBh 20T4kwCRxndx9ZQc3e+DXI3g5nirU1idJuu7g3wI8vJWlcU5UyEsGcofKy/htTG5fms3 iqKxD/DCkkEFikO2CQTdL/UYa58RmQOKDyvYJ2vCDmSXbY9j37DQMNZP5IuHqGODsC7V 2EoArauT/nOTYWsKE5MDnCWimhwDIAsBXSYrUFgbt51t98k3PK0rCa8Cz2gebfmnIV5U iLlw== X-Gm-Message-State: AOAM531fdXtNCWwvQ2KmbTZOKNpvPuyhtgA04a7Qt9nZqCuA4YQnM+tw Lp4aibSGeLreqZU6JHFzltfPY0vX6XnsVA== X-Google-Smtp-Source: ABdhPJzdSfck4Byun7hmPKNXLotlH8lzyjutQ5UAsF08PN7BJGs5fQofu/7VC1WpbIyscI7LaMx8WA== X-Received: by 2002:a17:90b:2284:: with SMTP id kx4mr3164162pjb.96.1615877212675; Mon, 15 Mar 2021 23:46:52 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:52 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:56 -0700 Message-Id: <20210316064511.2891553-3-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches Fixes: . * gnu/packages/gcc.scm (gcc-4.7)[#:phases][pre-configure]: When the gcc/config/rs6000 directory exists, replace "/lib64" with "/lib" in all files within it. Note that this fix will be picked up by any package that re-uses the pre-configure phase from gcc-4.7 (e.g., all the usual gcc packages). (make-libstdc++)[#:phases][fix-rs6000-libdir]: New phase, which does the same as above. It was necessary to duplicate the fix here because make-libstdc++ does not re-use the pre-configure phase from gcc-4.7. --- gnu/packages/gcc.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4d5aaa70701..3ea8695cf18 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -3,13 +3,14 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -273,6 +274,14 @@ where the OS part is overloaded to denote a specific ABI---into GCC ~a" libc line)))) + ;; TODO: Make this unconditional in core-updates. + ,@(if (target-powerpc?) + `((when (file-exists? "gcc/config/rs6000") + ;; Force powerpc libdir to be /lib and not /lib64 + (substitute* (find-files "gcc/config/rs6000") + (("/lib64") "/lib")))) + `()) + ;; Don't retain a dependency on the build-time sed. (substitute* "fixincludes/fixincl.x" (("static char const sed_cmd_z\\[\\] =.*;") @@ -598,12 +607,27 @@ using compilers other than GCC." (name "libstdc++") (arguments `(#:out-of-source? #t - #:phases (alist-cons-before - 'configure 'chdir - (lambda _ - (chdir "libstdc++-v3") - #t) - %standard-phases) + #:phases + ;; TODO: Use the target-powerpc arm for everyone. + ,(if (target-powerpc?) + `(modify-phases %standard-phases + ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. + (add-before 'chdir 'fix-rs6000-libdir + (lambda _ + (when (file-exists? "gcc/config/rs6000") + (substitute* (find-files "gcc/config/rs6000") + (("/lib64") "/lib"))) + #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3") + #t))) + `(alist-cons-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3") + #t) + %standard-phases)) + #:configure-flags `("--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") From patchwork Tue Mar 16 06:44:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27867 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 DDD8D27BC55; Tue, 16 Mar 2021 06:48:15 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 9D2A927BC52 for ; Tue, 16 Mar 2021 06:48:14 +0000 (GMT) Received: from localhost ([::1]:54842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Uz-0003Bx-Pg for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-00037Q-JK for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-0005Ym-9z for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uq-0001fb-7x for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 04/18] gnu: glibc: Fix ldd path on powerpc*. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich , Efraim Flashner Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772376246 (code B ref 47182); Tue, 16 Mar 2021 06:48:04 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:17 +0000 Received: from localhost ([127.0.0.1]:37908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U0-0001cL-Bv for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:17 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:40866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tn-0001ZO-Pf for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:04 -0400 Received: by mail-pj1-f48.google.com with SMTP id a22-20020a17090aa516b02900c1215e9b33so836892pjq.5 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hRipn9KqMffAGZPY8Nkxxqlg+Mq857NdsZhMGxvsdPA=; b=SDasqROyKa0JB5cmSuTYYjoN/27hwGw8GQStIHpOHWLYMVIJWlrFHHDjWn5FKG8nDP zp4KFVocHrXATjDLlagXw+NMWWAaYe/4uUzC6h3L3C7TiOBC9gGd9YZEV4keVsYjE7sO uZwPcZ3gEVdySTSgiW6jKzG88IAMuIghUQoLq4UFcGy8Oav7Kx8+dRTgDuo7hZkoKXaO IEdwY6Hg2JPxdFJb4CocSSie5Mged9hFviMr0Cwv9kCc677Kelg1TsKFI5KIIaezomv3 Uv1lzF/Ufr3CzuJbR/H4HzPL2NYZNE82+AazKYtrwUFl06frfDs4JItEpmMzE+2+o1pF E5eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hRipn9KqMffAGZPY8Nkxxqlg+Mq857NdsZhMGxvsdPA=; b=TP4c/dL+ENOW8rstiLg3hYTMeXBvGG8MZQdDbs99nlYPhmvQPNeYrOLSoVaSH31zNJ 4LPcacGq2+flL/k9bgDnucnD+4krlO76RN4cYoOyRdBFGxnw2Tx8ln3FfNfKcon0+FEc lQ+JxhCb+pYpilnZfEc4HhyBDtt7oqE8HEVhUxeTlwtQub4rdqlifXGv0f/dqYx8NbR0 3nI3mDjl1cv2UK5sM6fGLmBpXVsRqV2lCN8bdJHuedkdBYziB7Cyht93Qc28VOzalE0G NhyFf4Gd7iS7OxNHIgO2fp8ZNPWrupX22fYqFXc05gYNUL+3Yiez0nrnC7fX6PApeiAx Recg== X-Gm-Message-State: AOAM5322Ui8isQErPFwmKbg6jgbiwg2zSetguYL1yNvSN2yD9H0NaPPi YsgqXj2rvyKQa1mqe0tBmr6/oaKjqSv7jw== X-Google-Smtp-Source: ABdhPJwGk5/sqXfXxum/yc95ougy45WGt1tG6lUitSVJPvNmIF8gccdEkshrOqKCHcKzFTHMDOYCPA== X-Received: by 2002:a17:90a:e64a:: with SMTP id ep10mr3374380pjb.105.1615877213726; Mon, 15 Mar 2021 23:46:53 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:53 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:57 -0700 Message-Id: <20210316064511.2891553-4-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter This should avoid some problems, such as "not a dynamic executable" errors. * gnu/packages/patches/glibc-ldd-powerpc.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm: (glibc)[native-inputs]: Add it. [arguments]: When building for powerpc* apply it. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash, glibc-final)[native-inputs]: Add patch conditionally. This patch has been adjusted to apply to master. Signed-off-by: Chris Marusich Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + gnu/packages/base.scm | 16 +++++++++++++++- gnu/packages/commencement.scm | 10 +++++++++- gnu/packages/patches/glibc-ldd-powerpc.patch | 10 ++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-ldd-powerpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf8849cf598..4bd333e56f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1120,6 +1120,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-locales-2.28.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9aa69cfe773..7c5ac61f01c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra @@ -15,6 +15,8 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2020 Vitaliy Shatrov +;;; Copyright © 2020 Chris Marusich +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -890,6 +892,14 @@ the store.") files))) #t))) + ,@(if (target-powerpc?) + '((add-after 'unpack 'apply-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "powerpc64le-patch"))) + (invoke "patch" "--force" "-p1" + "-i" patch))))) + '()) ,@(if (hurd-target?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -911,6 +921,10 @@ the store.") ("gettext" ,gettext-minimal) ("python" ,python-minimal) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ,@(if (hurd-target?) `(("mig" ,mig) ("perl" ,perl)) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 432910d7a30..93b0c508822 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3313,7 +3313,11 @@ memoized as a function of '%current-system'." `(("bison" ,bison-boot0) ("texinfo" ,texinfo-boot0) ("perl" ,perl-boot0) - ("python" ,python-boot0))) + ("python" ,python-boot0) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()))) (inputs `( ;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. @@ -3464,6 +3468,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This time we need 'msgfmt' to install all the libc.mo files. (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ("gettext" ,gettext-boot0))) (propagated-inputs diff --git a/gnu/packages/patches/glibc-ldd-powerpc.patch b/gnu/packages/patches/glibc-ldd-powerpc.patch new file mode 100644 index 00000000000..8e899ee99b8 --- /dev/null +++ b/gnu/packages/patches/glibc-ldd-powerpc.patch @@ -0,0 +1,10 @@ +diff -r -U3 a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed +--- a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 1970-01-01 01:00:00.000000000 +0100 ++++ b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 2020-02-29 00:15:41.080000000 +0100 +@@ -11,5 +11,5 @@ + # this works for /lib64/ld64.so.x and /lib/ld.so.x as input + s_lib64_lib_ + s_64\.so_\.so_ +-s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \164\264\3"_ ++s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \1\264\3"_ + From patchwork Tue Mar 16 06:44:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27878 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 4D00927BC54; Tue, 16 Mar 2021 06:49:29 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 C8AC727BC52 for ; Tue, 16 Mar 2021 06:49:28 +0000 (GMT) Received: from localhost ([::1]:58302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3WC-0004h6-1z for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Up-00035G-3m for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uo-0005X7-Lt for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uo-0001f7-KR for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 05/18] gnu: gcc-boot0: Enable 128-bit long double for POWER9. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772316191 (code B ref 47182); Tue, 16 Mar 2021 06:48:02 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:11 +0000 Received: from localhost ([127.0.0.1]:37899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Ty-0001bg-OM for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:11 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:43563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3To-0001ZQ-VW for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:02 -0400 Received: by mail-pg1-f169.google.com with SMTP id n10so21966599pgl.10 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CM+YzKlFQD9Xpsa5RmduphAcp4TGu1GOUhOmmL04qzk=; b=py6O4269vJh2sI92gcFeAcAJfAS9PLfNcFaZHSZqywx5UyC4NTnRuTzHUo4Yn53MN+ mMjED6seC3ONp55mm2FpkHY/FHOjHDKIVvzpsIEOcp4sg+MfgurMVcTOwekd0U3SF0+5 xk1XgPth39V7VUJQInlwtgGxP8MTIhkJTXmYqcV2r/yyoCeQLVB4AObfPjlFv/mj40xi tzFTCxdVz2xSSLwiyGteaQVaa2VPay1KGAkv1qV6/E1mTy9xDCC7TZarP8p6XyK2FsjH WMGQX9PnVbOaOn7gDtSj+kR0Z/AcZc101HREJ1KZEx9iMsea0sIWELScmnrLQWkAVqRV F+NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CM+YzKlFQD9Xpsa5RmduphAcp4TGu1GOUhOmmL04qzk=; b=JRDoS66TPDpP5s3h2WuGFZmLYKu5pDXTlcVsMKyn7DtcOgU+9/NeAXE0lox+/F76Nt nOxaq8tnML4c/glUTVga6kE0TzhA/ef30jT8LEM9xI+QMr0POFkj4CirCcwmZfw0aisO eo+j0r02Rx/Q6q5lrhItk+wFJ6Pl/DxBycbuDcfwYqLDuWmOlC3WZeT+KIiESsrRHoEk 2H/nI/gmop7MD+4kUNpdZEK3qZM/HMWB3h9CmZIF4px9tfrk9hjqZov55n0XUBVKWp9T lzL1TAinVx3WT8wzgqXxR2v6X4aoSIgpZkTDHxss//ZMw7i/NZNMrf0KzHnb3PgPvbfV AYBg== X-Gm-Message-State: AOAM530gbacEEO2BDbKiSukpLX263Q4c8EisNvRm08IxvjK3TFZ5LLBp 4Hwcfu6g3+0XypMc29vQAs9Awq6QcbS5ww== X-Google-Smtp-Source: ABdhPJz4qNY/8YiaWSxVBzHMgZWaW8vy/bAIIsO+Y8PX4yCZSn87YArXoYr9eO2Jc2qSTWZ2d2rlvg== X-Received: by 2002:a63:1021:: with SMTP id f33mr2582903pgl.409.1615877214698; Mon, 15 Mar 2021 23:46:54 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:54 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:58 -0700 Message-Id: <20210316064511.2891553-5-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (gcc-boot0) [#:configure-flags]: Add --with-long-double-128 when the boot triplet is "powerpc64le-guix-linux-gnu", instead of "powerpc64le-linux-gnu", which is incorrect. The actual triplet used during bootstrapping is "powerpc64le-guix-linux-gnu". --- gnu/packages/commencement.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 93b0c508822..86bc7a602da 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -2818,7 +2819,8 @@ exec " gcc "/bin/" program "--disable-shared" "--enable-languages=c,c++" - ,@(if (equal? "powerpc64le-linux-gnu" (boot-triplet)) + ;; boot-triplet inserts "guix" in the triplet. + ,@(if (equal? "powerpc64le-guix-linux-gnu" (boot-triplet)) ;; On POWER9 (little endian) glibc needs the ;; 128-bit long double type. '("--with-long-double-128") From patchwork Tue Mar 16 06:44:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27879 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 4E91527BC54; Tue, 16 Mar 2021 06:49:43 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 9E61F27BC52 for ; Tue, 16 Mar 2021 06:49:42 +0000 (GMT) Received: from localhost ([::1]:58734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3WP-0004ry-SF for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Up-000368-MM for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Up-0005YD-EB for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Up-0001fM-DA for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 06/18] gnu: binutils-final: Provide bash for binary on powerpc-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772326217 (code B ref 47182); Tue, 16 Mar 2021 06:48:03 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:12 +0000 Received: from localhost ([127.0.0.1]:37904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tz-0001bv-G9 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:11 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:38354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tp-0001ZR-LO for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:04 -0400 Received: by mail-pl1-f181.google.com with SMTP id s7so16479645plg.5 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mCgfOotGcdYTEew0k371CAxUFvruEfYAIRiJ3PtePdY=; b=fTKJzLek7ufqy8WEw5AI94GqytgGI0Lm7FZkeYoB99KPCOzAHj8L9q4xGhOpnHF3in N+c6AXafBPNhJl5rApb1Eyy6uIQ1CiFYY9Yr1zmzlqwi0jOnMnPuadVMqnIHEf3nMdp5 K9JCXLmtYDKg/qs3gosI2kI9G4a4EPXEfusB1FDrDvq0wr5o3+h6Y5wo/U1lz4vW61ms p1HF0f8Am9mlArgXVZSJWDcV/0ulgQGGnqNkPk6FjitcMX37hYt4yXFRPji7QJJuqif2 0LezjQjVUfMAUqAM8e2KWOxpRlxWS1amPfKMQ3vQ5mDWKDiqqgYT4G/sYJMym1139Wg5 RvWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mCgfOotGcdYTEew0k371CAxUFvruEfYAIRiJ3PtePdY=; b=tVDMxAyMPoPsYPW872pxoSabvIJSm9EmG23bdaGzmCXKFq23Jhu8Ae3nJNnFFysVtp B93h2tWpN+2Dc6ar4dtF2YMmNY2C1a0bIwS9AdV2R16LnKGSV+eNSSTZ5KPkwWf7ZE9g jl8cSGiNJ7aO+//3ksy3AJlra9W70Y4HumF9jMiepp5sGBMT4zavei4NLxvU8YmE5bSr /kCd0VQt6EW6BD+QwpXc6YJWFGNkG8WSNwkdTYFQIGoB/xO/DVEi0+9gJwxD4uY/QcLh JB+vUyWN98ZHeM/+tXcQ8O8YMgVUBmbLh1JnBQFarDYVezTksD1+kVoq5qKPs30HJD3g KGmA== X-Gm-Message-State: AOAM532/IBqNuRBmMoy5nmQFQWigEyNjihIvwKoDLHNtm0AJ7d6JSS3W prIslLkV3tzJPdvIwhV+uurrnfjLgq9OPw== X-Google-Smtp-Source: ABdhPJzZFj7cB0bYysF8YywVNeWYtFaPASnJbxLLjYBlgGJ6IwZ7u/kPBSjg9MJpwVh6eblwPNWEPA== X-Received: by 2002:a17:90a:f82:: with SMTP id 2mr3389431pjz.196.1615877215605; Mon, 15 Mar 2021 23:46:55 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:55 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:44:59 -0700 Message-Id: <20210316064511.2891553-6-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Efraim Flashner * gnu/packages/commencement.scm (binutils-final)[arguments]: On powerpc-linux allow a reference to static-bash-for-glibc. [inputs]: On powerpc-linux add static-bash-for-glibc. --- gnu/packages/commencement.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 86bc7a602da..c0732bbf62d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3514,9 +3514,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - #:allowed-references ("out" ,glibc-final) + #:allowed-references + ,@(match (%current-system) + ("powerpc-linux" + `(("out" ,glibc-final ,static-bash-for-glibc))) + (_ + `(("out" ,glibc-final)))) ,@(package-arguments binutils))) - (inputs (%boot2-inputs)))) + (inputs + (match (%current-system) + ("powerpc-linux" + `(("bash" ,static-bash-for-glibc) + ,@(%boot2-inputs))) + (_ (%boot2-inputs)))))) (define libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC From patchwork Tue Mar 16 06:45:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27866 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 6D81927BC54; Tue, 16 Mar 2021 06:48:12 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID 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 000EB27BC52 for ; Tue, 16 Mar 2021 06:48:12 +0000 (GMT) Received: from localhost ([::1]:54688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Ux-00036g-3x for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Up-00035W-9e for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Up-0005XX-1r for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Up-0001fE-0d for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 07/18] gnu: binutils-final: Support more Power architectures. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772316198 (code B ref 47182); Tue, 16 Mar 2021 06:48:02 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:11 +0000 Received: from localhost ([127.0.0.1]:37901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tz-0001bo-74 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:11 -0400 Received: from mail-pj1-f42.google.com ([209.85.216.42]:37382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tq-0001ZT-Jg for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:04 -0400 Received: by mail-pj1-f42.google.com with SMTP id x7-20020a17090a2b07b02900c0ea793940so853832pjc.2 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qXk0xIF6XlIjXJ46u9aFl+Bz44iZBtFCltISJE8URfc=; b=Xf7SueqmDAOBosmyUpfRnPIPwSrq5pjZA/PPQhPXG9nAO2JfHPnXPE/F11vwRc3G51 EzG3uJUvWViiw+SbpIKkmHBXk/HbitEQ053cdDye7VQNNyGp6BUfxl+zXt7++S7BJogY B3QoR3RrQ+9QZdSRbF9umiB/h77IugMW4mMjpSpEbbhHqNOrbu7WHKKlQCEU8jQpRoDz 6qfXHhLN12Gx+ZcoD3pJqQKVdnBWjgP7B4Ou9mM/IbNez+VNWfy7CjRew6+PpGcZGLsW vNzeMdy+NoIoDrhAZ74cRP2Po6DiUDCiV+Ahkj7fGZvX8ZDHqjVKNGJEx0UzG81bvf4B RX9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qXk0xIF6XlIjXJ46u9aFl+Bz44iZBtFCltISJE8URfc=; b=gxY64+gpETjZeAV4OS8pgyjMpfRNlmHeClCNAFk0rJ1ugQdMg/4/HeODEqnx3HOV5t pQkkGyfFkFnFYHQwhmA+TEQdSR2aVkXvj4baA/0jkyXjifJex2kF73e8vf3bg50q5gbj TvKx0mq47WFqTl7nWb1GrEwBeYvlgtymIJt+FJXW5YBXY/p2WKeZ+II+148E8XVOLytW +sfjeiV3EApsP8kww1M53x9BFxBiRPpLPpaTjmswX+NkrdDqrjoYREuWFW9HKDhaQM5G TjZk5CrbIS/FEWkGpupsMWDNyhXY6wqZ8lm3P8zYNVuwqs3xYKD6wq09qMeHmYFoC3bd cbGQ== X-Gm-Message-State: AOAM530GAHwWTnuRiL+6hndvAhGNfSeiEII3yqAJm8i527M5abSPxjB5 kWVeR8YXowbzRTOSV+aeuHv+SyVYOKnX+Q== X-Google-Smtp-Source: ABdhPJzNaiQaTeG0Nd7N5p+G966ztQ34MvqE4g/irB97a0P8KXufp9O1NGiDg3l5ZOXiyrH+c4Dgww== X-Received: by 2002:a17:90a:9309:: with SMTP id p9mr3416198pjo.174.1615877216472; Mon, 15 Mar 2021 23:46:56 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:55 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:00 -0700 Message-Id: <20210316064511.2891553-7-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (binutils-final)[arguments]: When checking if the system is a Power architecture, instead of hard-coding "powerpc-linux", use the target-powerpc? procedure so it works on more Power architectures. [inputs]: Likewise. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c0732bbf62d..d4511ed9148 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3516,14 +3516,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:implicit-inputs? #f #:allowed-references ,@(match (%current-system) - ("powerpc-linux" + ((? target-powerpc?) `(("out" ,glibc-final ,static-bash-for-glibc))) (_ `(("out" ,glibc-final)))) ,@(package-arguments binutils))) (inputs (match (%current-system) - ("powerpc-linux" + ((? target-powerpc?) `(("bash" ,static-bash-for-glibc) ,@(%boot2-inputs))) (_ (%boot2-inputs)))))) From patchwork Tue Mar 16 06:45:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27869 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 C725927BC54; Tue, 16 Mar 2021 06:48:28 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 0A47427BC52 for ; Tue, 16 Mar 2021 06:48:28 +0000 (GMT) Received: from localhost ([::1]:55386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3VD-0003SA-8k for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-00036a-2O for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Up-0005Yd-R8 for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Up-0001fT-QI for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 08/18] gnu: bdb-4.8: Fix configure on powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772326224 (code B ref 47182); Tue, 16 Mar 2021 06:48:03 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:12 +0000 Received: from localhost ([127.0.0.1]:37906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U0-0001cE-10 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:12 -0400 Received: from mail-pf1-f179.google.com ([209.85.210.179]:36164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tr-0001ZY-Nw for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:04 -0400 Received: by mail-pf1-f179.google.com with SMTP id x21so6844080pfa.3 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u4zj1qhgYJBsNblt5f8mIxKezqxhrhsglIf5owPuryc=; b=Y1NVhksAapwXXyirX5ICQhrqVQ0mGHq1ilfEqxAHzfqVEn9Jvk4pOa/xgsmUDWFsQu 7tz7VhNaF1977L/YHkfHz7od2uZplaWLK0iF6UOY6MgmI4cczujjEY5GDK+r8AZH2hkY UZdAEYNEuOB8IXTy171BA5DFkNba5KLTRMPgm89lYb7UeO5yWz9AD+6MC7VxYgcrI1Az mprMxvZ7EqfoiZ0kejCWC0OB6dHbqyTSDtVnRhHXRneS3g+NLqvpQlmcFv41/QlB7cEA 351Cw6FjKTqnEMn4A2A/fPMvLSXIgjIjf7feNrVKdG77ezzydkqr6kfbXKstbKT3QW3+ CQjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u4zj1qhgYJBsNblt5f8mIxKezqxhrhsglIf5owPuryc=; b=kbDrRHmdLrFTrs9GEIG4HCvJ7wydIWO31lP1BLxfeAVjrx6Ti41teJH/okKnQ5GXwV 8ABumIgsCN+zAeaYTV78OHit8iZc95exW2PDeHUpoLHVxWjyUZqDBpR/1qY2wwlSsRmy swxXGNorm+Qn8wSXRA/eet9apKVdU7xgXUex9CbvmVNUuA085WJnFe1lNiZm//sAaTmH urbO+UKRpatbezB4clmWyUJf2Ky66oOq4qtNFRj9boab0NcDfFRRGQrF1YqhcbHES05g jE3T+B0BPt64kTqJk7jUrP8raY+hx7BIqW6ElwX6qRQj/IJy1T08paGn+rPtNa7Vkwiv 8pWw== X-Gm-Message-State: AOAM5327mFqEBZODXEIkHy3a7G4vMK1UPHVMclxSwlHBxilZNJYoAC/i 4lT1l+lmyaSGfZ+ON5b2CluuVcZ/gwM2jA== X-Google-Smtp-Source: ABdhPJzzglfyxqSMbZ9RB0AMEojLOQb2cMs6QdE1EM4QoLLAYDiJM62tanT8jiAHUGNnHDARHgahOw== X-Received: by 2002:a65:6a01:: with SMTP id m1mr2563319pgu.215.1615877217463; Mon, 15 Mar 2021 23:46:57 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:56 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:01 -0700 Message-Id: <20210316064511.2891553-8-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter * gnu/packages/dbm.scm (bdb-4.8)[arguments]: Modify 'configure phase to append "--build=powerpc64le-unknown-linux-gnu" to configure's flags when compiling for powerpc64le-linux. Signed-off-by: Chris Marusich --- gnu/packages/dbm.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 82647c0c283..2dd51efb8c9 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,11 @@ '("--build=aarch64-unknown-linux-gnu") '()) + ;; Bdb doesn't recognize powerpc64le as an architecture. + ,@(if (string=? "powerpc64le-linux" (%current-system)) + '("--build=powerpc64le-unknown-linux-gnu") + '()) + ,@(if (%current-target-system) ; cross building '((string-append "--host=" target)) '()) From patchwork Tue Mar 16 06:45:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27870 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 030F727BC54; Tue, 16 Mar 2021 06:48:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL, URIBL_SBL_A 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 7D26627BC52 for ; Tue, 16 Mar 2021 06:48:33 +0000 (GMT) Received: from localhost ([::1]:55672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3VI-0003ZG-M2 for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-00038R-V8 for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uq-0005Z6-MX for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uq-0001fi-LD for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 09/18] gnu: guile-avahi: Fix compilation on powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772386252 (code B ref 47182); Tue, 16 Mar 2021 06:48:04 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:18 +0000 Received: from localhost ([127.0.0.1]:37912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U5-0001ch-P9 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:18 -0400 Received: from mail-pj1-f44.google.com ([209.85.216.44]:43874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Ts-0001Zc-Cz for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:04 -0400 Received: by mail-pj1-f44.google.com with SMTP id mz6-20020a17090b3786b02900c16cb41d63so907190pjb.2 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iE35o8mVGHoVZfrJTtyt04DFnc/t7lumIXW2L/b+NuM=; b=stEGhZl8SDyR5DaKsaVOCbzF1QJf3uzSmfpLiG3KYO/FoJ8GwQBywYDC7W6KR+w9XS VD+vq4AsG7gBaEBUEugZcF8aCcpA4AT49z29cJoPbbCucgKzoYXmEdt6bhjMTVJoXsSu EfgUZ0le1R1c4+zCbmEOmgQEvkHJeoV47rn1bFlcPGdUaS3M+BBVs3yG1ZRYoW17e8FO gnU+URkexMY6v+ls3I9VUb+Ge/U+UcnOKZkS/G3Z1ieKlzE4UZ6tXc/xT3GwGz7Brp6w Git7xuI1Yh8uG5wkrwFarXJdJnTqJ8+VQRahHbGjbketT65KbrC7g7UHSCdvw/gyfLbN 6ioQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iE35o8mVGHoVZfrJTtyt04DFnc/t7lumIXW2L/b+NuM=; b=PkKcXrQ9dwITpeaFUuz1OWmofHH35Gb43orn+fdNxyaUKXtE4pyxbIztjychwAY28M 16NaEwt3vAaXCjMWrh4j7v7pyLmK7Rqatr0NRza58221ztXahpScHLLrYT0ptbBRQ9yU KYbsFeUv3ERETvvPpLAbmi6Co2x8Um2D4eu3lBmdIF2G07L5CuLSGFu8QA9h0fsMkjVh kjoAdzKsXuBd0Q3Nv0PjZf7H8hFtG1A18MgwY/0+Ka1LDbTXMI4bGyOr4TZy1Kt91I48 uMfGPBwl6aGH1L+DmAF2EEDCnRPAQelACUu42fXVLwAsOcP67+XkMcQWAl2lZoHPWOHb dWZQ== X-Gm-Message-State: AOAM532t03GYjZ6HhRsvaX/IjMA9vIuLoOtsIzLoMfZT0jA9VscnWm8H UAfO4O37y8lF7xUj+6hSAqH0gJqtCoRreg== X-Google-Smtp-Source: ABdhPJwEtkvGJlk4AJ26VurvrmBrAuNUxOU722hfW1krqOUQ89Uu8E640iO6Dk5BkYw0/P7zBM74eA== X-Received: by 2002:a17:902:a406:b029:e6:78c4:71c8 with SMTP id p6-20020a170902a406b02900e678c471c8mr15406174plq.17.1615877218351; Mon, 15 Mar 2021 23:46:58 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:57 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:02 -0700 Message-Id: <20210316064511.2891553-9-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter * gnu/packages/guile-xyz.scm (guile-avahi)[arguments]: Parallel builds fail on powerpc64le-linux. Set "#:parallel-build?" to "#f". Signed-off-by: Chris Marusich --- gnu/packages/guile-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2e02f6f4821..449c36e08f0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -4284,6 +4285,9 @@ errors.") ,@%gnu-build-system-modules) #:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + ;; Parallel builds fail on powerpc64le-linux. + ;; See https://lists.nongnu.org/archive/html/guile-avahi-bugs/2021-01/msg00000.html + #:parallel-build? #f #:phases (modify-phases %standard-phases (add-before 'check 'fix-guile-avahi-file-name From patchwork Tue Mar 16 06:45:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27873 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 AEBAA27BC55; Tue, 16 Mar 2021 06:48:54 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 BF9F427BC52 for ; Tue, 16 Mar 2021 06:48:53 +0000 (GMT) Received: from localhost ([::1]:56492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Vc-0003v4-Vd for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-00039C-Du for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-0005ZV-3l for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ur-0001fp-2a for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 10/18] gnu: texlive-bin: Fix compilation on powerpc64le*. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772386260 (code B ref 47182); Tue, 16 Mar 2021 06:48:05 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:18 +0000 Received: from localhost ([127.0.0.1]:37914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U6-0001cs-54 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:18 -0400 Received: from mail-pl1-f175.google.com ([209.85.214.175]:43910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tt-0001Zk-Ez for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:06 -0400 Received: by mail-pl1-f175.google.com with SMTP id f8so2969782plg.10 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4yCwNDAQfkELzzqXrDQLFxmaYLrLLDdntwljT/Tlfp8=; b=QvOt65H6d9KvcllEaZkePIylGyRMHQ6F4CaPi13bB/eXLtSs1QaQBB48cNQ8vhNQ0Z /lCbAVRlOsK6cdq6XkfsYREDM91gaAm3IWQHpEDbdcAcTF+TytbzGE2LMpDbh4xxheOt e7O6FKVwq4i9S1E1K9JaRKWHXva0WQex3LVndVJ0D0YY4hhPH/YK83JXAeGQEi6HoWC7 IgeDhyKQ8WFZFn5tln6a2ZbQZZNeFlVvUUc661nhGOM1wMhjhRdv8TENV3AfsDGsipUp BJVmagXdR0sqjLNWtaJu60I8O78uyLiToAx1i0IHYXdiG3nq8vzlCjgZBc8pwXyUH2bV 6KoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4yCwNDAQfkELzzqXrDQLFxmaYLrLLDdntwljT/Tlfp8=; b=d9OdgPbiGeY2mit3/EU7sqE5Vm1RB+NrKQsi3FXVRXbuZ6lej/SVnUZ0fvmihAqEO2 yGIPoP1w7jt++p8xbP81E8hjAgg+wJW9o2/Dw75EGRnB7lLtIn0FPrjUjsVB0+tyet0/ c33mPcaw1DCvTogZT3saKAb0J+9348EMqbMW9OA8QGIvD/hMmHcnsZ1CLWceLiDbIoEZ zfyKJwLveK+ei05u+tJyev+T8C/PNSyMDo0yB/whYEqoMByiLpk4jNpvgyUcvlnQj0ng k4fuDkFzZnjsbEu/TLX55+9I14FxY0cDhIa22bz91fHzve+i+h64ZtE18xg2SWhoVShR b7Pw== X-Gm-Message-State: AOAM531S5rhkKwT8YxBjfGDKDTvGdDjww6UVRySuPOCb3CX6WOl2A/MO tLqBnwzylIY0ACmvn3QJru5/+36PfcO0ag== X-Google-Smtp-Source: ABdhPJzqcgBHuRUqfjFho+KrRmOtgcrDt+f6E6s7Fs+d6NXR0PfIzrF1i12B6qMx0FtvDBRMNbfcjw== X-Received: by 2002:a17:90a:1a59:: with SMTP id 25mr3335904pjl.54.1615877219395; Mon, 15 Mar 2021 23:46:59 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:58 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:03 -0700 Message-Id: <20210316064511.2891553-10-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter * gnu/packages/tex.scm (texlive-bin)[arguments]: Append "--disable-luajittex" and "--disable-mfluajit" to keyword argument "#:configure-flags" on powerpc64le* because LuaJIT is not ported to powerpc64le* yet. Also set "#:tests?" to "#f" on powerpc64le*. Signed-off-by: Chris Marusich --- gnu/packages/tex.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c0f4ff0fcdc..508537acdaf 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Paul Garlick ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,14 +343,23 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. "--with-system-teckit" "--with-system-xpdf" "--with-system-zlib" - "--with-system-zziplib") - - ;; Disable tests on mips64/aarch64 to cope with a failure of luajiterr.test. - ;; XXX FIXME fix luajit properly on mips64 and aarch64. + "--with-system-zziplib" + ;; LuaJIT is not ported to powerpc64le* yet. + ,@(if (string-prefix? "powerpc64le" (or (%current-target-system) + (%current-system))) + '("--disable-luajittex" + "--disable-mfluajit") + '())) + + ;; Disable tests on some architectures to cope with a failure of + ;; luajiterr.test. + ;; XXX FIXME fix luajit properly on these architectures. #:tests? ,(let ((s (or (%current-target-system) (%current-system)))) (not (or (string-prefix? "aarch64" s) - (string-prefix? "mips64" s)))) + (string-prefix? "mips64" s) + (string-prefix? "powerpc64le" s)))) + #:phases (modify-phases %standard-phases (add-after 'unpack 'configure-ghostscript-executable From patchwork Tue Mar 16 06:45:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27868 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 A548E27BC52; Tue, 16 Mar 2021 06:48:16 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 9C5AA27BC54 for ; Tue, 16 Mar 2021 06:48:15 +0000 (GMT) Received: from localhost ([::1]:54908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3V0-0003EG-QQ for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0003Aw-6M for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-0005Zn-Tf for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ur-0001g4-Rq for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 11/18] gnu: texlive-latex-base: Fix compilation on powerpc64le*. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772436286 (code B ref 47182); Tue, 16 Mar 2021 06:48:05 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:23 +0000 Received: from localhost ([127.0.0.1]:37918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U6-0001d6-Ru for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:22 -0400 Received: from mail-pl1-f169.google.com ([209.85.214.169]:37642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tu-0001Zs-SW for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:08 -0400 Received: by mail-pl1-f169.google.com with SMTP id 30so11925125ple.4 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YXkBJSQkUXtfOogqwY96ifKoUAGQwW8Jie2cQIp6hPE=; b=ZbymP/FC8od0/OQB2rz0YLsp5P7SzlAvdHi71AYRVccGPIV/XXrUpXuTs0DYHtP+WK AV71/EbdIe6EdjQ51d9nnPP0iEKUILyEYBmKrwQ/arvDLM9o+DuIxbg7Z2NM+8tv296v yQffXkAKRL+nDjHs6rwpz7wxn/rHie5x+RYN0ti27K5FNe42hG9FCMCk9SrnbEl1k7QI +S+SWWOxJhA9U1MogQdTM7evEuj4aglrWY9wI5O8S+B8O368aZ9WVMp7FyJDUGSNkxCB BfHbSML0utJDVZiWdQoEYL13rOpO7rwf9zfMnNpydiXqMOxIAbkU0KsCwBJ5PcehfSdU msIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YXkBJSQkUXtfOogqwY96ifKoUAGQwW8Jie2cQIp6hPE=; b=dqJGjODics/B94hLhi7yZ1Rqeoe7CRrGCGDObF3hnC0Y1D1PexWz2cg0dM8h+UhMg9 PrLhX5Y2qrTfwFrWWPojUHHnOt+pFxWNfpTx9CQGStKj1x+jA8+SWvwHhI2PzHjrhd0Q YeijpiLbZi7LkKJIfVTWFhMARCyYaawsJ+Ll8e46jgqwOYGsk0Sgm+4ns+IUtsHMxXeV ZDVH3mJ3b5TUAabobYGuPc+cVG2QL+IYGzfrUykWZXfz1PpsEapwE1qS8Q8XRDL5uHGE 91W8Ua9hkHKA0b9wKNKhJ5hvWg4rg7u82lYUvkHVa4Xo0j6cc4qnAog7PE70Cw/zvJRE x4bg== X-Gm-Message-State: AOAM533scQYOJaNUD1oOYAEdEfgSbfsifwj731o6b3fX4HSOTs6lh+wg n3eXyxUC6daxyxBp6pE89TuUutSulr7qmQ== X-Google-Smtp-Source: ABdhPJyMOUcT6pQQRBjbIsbo4l4WSmgSkbgfKm11uKgAD+xANzOon1rzrt9V0V4gJuWELX11r6MITA== X-Received: by 2002:a17:90a:c08a:: with SMTP id o10mr3261696pjs.67.1615877220478; Mon, 15 Mar 2021 23:47:00 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:46:59 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:04 -0700 Message-Id: <20210316064511.2891553-11-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter * gnu/packages/tex.scm (texlive-latex-base)[arguments]: LuaJIT is not ported to powerpc64le* yet. Update replacement 'build phase to add "luajittex" within the "disabled-formats" list on powerpc64le*. Signed-off-by: Chris Marusich --- gnu/packages/tex.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 508537acdaf..86cb1ee4558 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus @@ -2520,6 +2520,10 @@ formats.") "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" "luacsplain luatex" + ,@(if (string-prefix? "powerpc64le" + (or (%current-target-system) + (%current-system))) + '("luajittex") '()) "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex" "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex" "mptopdf pdftex" "uplatex euptex" "jadetex pdftex" From patchwork Tue Mar 16 06:45:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27872 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 F2F8A27BC54; Tue, 16 Mar 2021 06:48:39 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 786BD27BC52 for ; Tue, 16 Mar 2021 06:48:39 +0000 (GMT) Received: from localhost ([::1]:56254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3VO-0003p2-MQ for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-0003A2-OU for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ur-0005Zc-G2 for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ur-0001fx-FD for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 12/18] gnu: libelf: Fix compilation for powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Leo Le Bouter , Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772386267 (code B ref 47182); Tue, 16 Mar 2021 06:48:05 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:18 +0000 Received: from localhost ([127.0.0.1]:37916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U6-0001cv-FW for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:18 -0400 Received: from mail-pj1-f45.google.com ([209.85.216.45]:42988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tv-0001aI-QC for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:08 -0400 Received: by mail-pj1-f45.google.com with SMTP id j6-20020a17090adc86b02900cbfe6f2c96so908737pjv.1 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H3JgwYIHomyg/LMrowpCbH0/Z7faQ4D4x70+uPLkFjE=; b=H8ISHBGN5RxJrPlXgad7bk7HHhbsaYcRQBCoW0N1wwy0mzgF+P3PceoSQ1L1yLj2Hs 8P7Nkyk0a3snGmto8oFDAzcUd1W62yOv0ZkmGbUXew4ycAiR9psMrQyiXUne2fqc9tj+ 528ufvIx/pW12wxokLK9QhlJDCc77AkyaAjGUGcOTfenbx/Hh42BjIc4Csxg56OOlDGw 9mcry7x9mLGXgQhqEMOwYICAvndLJCQdkW8O6r3s9Vqiu5gPAqEMMo+2KS0opQ9iCk2B 1N3vAwoZDBUvaGDAgLvfxoZgbccr1lYx07A5FRy0B3UiVHckr3wgia95vNOwreRk6yaL +Ktw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H3JgwYIHomyg/LMrowpCbH0/Z7faQ4D4x70+uPLkFjE=; b=YGSHzQPwucdZpXgRdqUQYciRjqvs0dJi0NP5UhZOCJoQTUEIr8f4j1stfOvi0/+OVM xg6ZkUfCO1McKmkTCpQixuyvAzPsMSmiSejtyWyhZ0CGc/T1DaL3xOffldyzB70KoKet EFdhU77BTG/YZzczqRE5JX25F0k1QZv6TRFtxwf1s0CPS6rUQBpguxbLLqaFtif0vwFH upoYNq+R9RkePKStStizovcHkNN6Xwoj055igkZzBN4mdLhtRgY5fUbtsf9Kx0cB89fA 6qRLpSOyEv1OzR4T/XYQhdCbgKT3hWbyi22eLSRBq1hM5+eOLde/qdpkQMa3D88x+yZU 22Mw== X-Gm-Message-State: AOAM533UnKgmS1zarK846aO2QPH+1eiD1nT4mFIcchv+oo9uSOei6eUF gODU4gl2LBNyCbZB1XSHQ5niCCjetp+1Pg== X-Google-Smtp-Source: ABdhPJyuSUYCPRQ/OFyufkjiOsquwI9S0r7XAi3pvKHPMD8adjT4hK1xpIDA4QSk+0BF7z60LfOFKw== X-Received: by 2002:a17:90b:3716:: with SMTP id mg22mr3218524pjb.157.1615877221719; Mon, 15 Mar 2021 23:47:01 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:01 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:05 -0700 Message-Id: <20210316064511.2891553-12-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches From: Leo Le Bouter * gnu/packages/elf.scm (libelf)[arguments]: Modify replacement 'configure phase to invoke "./configure" with "--host=powerpc64le-unknown-linux-gnu" on powerpc64le-linux. Signed-off-by: Chris Marusich --- gnu/packages/elf.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 2e21cab48d1..aab912648b2 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2020 Mark Wielaard ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -211,6 +212,10 @@ static analysis of the ELF binaries at hand.") (setenv "CONFIG_SHELL" (which "bash")) (invoke "./configure" (string-append "--prefix=" out) + ,@(if (string=? "powerpc64le-linux" + (%current-system)) + '("--host=powerpc64le-unknown-linux-gnu") + '()) ,@(if (string=? "aarch64-linux" (%current-system)) '("--host=aarch64-unknown-linux-gnu") From patchwork Tue Mar 16 06:45:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27875 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 1D25027BC55; Tue, 16 Mar 2021 06:49:06 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 DCA9C27BC54 for ; Tue, 16 Mar 2021 06:49:04 +0000 (GMT) Received: from localhost ([::1]:57068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Vo-00049l-1X for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0003Bk-KV for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0005a1-AK for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Us-0001gB-8L for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 13/18] Add powerpc64le-linux as a supported Guix architecture. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772466300 (code B ref 47182); Tue, 16 Mar 2021 06:48:06 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:26 +0000 Received: from localhost ([127.0.0.1]:37920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UB-0001dL-1P for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:26 -0400 Received: from mail-pl1-f170.google.com ([209.85.214.170]:45335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tw-0001ad-RD for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:09 -0400 Received: by mail-pl1-f170.google.com with SMTP id u18so16462816plc.12 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JxeS4ykx8M13NNPGaiBn3H7mUrjFA6EZUfNxxGq0Uzg=; b=XCsyX/k0MVavYTdTKw/lYY4fsLMpIRH93t6hktPj6n9DnIUCfVUwKvSijZUlWdGRXh +Z9qVOJjO3AU2Mtonz292TS1mCHZliC6Gz2IOFLLsi+xlKKSYdoovOSVsjPErNZ1JSeF xMq7oOY88j0DIDij2keuyP2Wth5pfUm2YdQfdnfWyXIBpI3XX0nz1N8a7F+UGtTFdipo yt34xupuTvkzbkWZNtWaapOk9VYNTfr0kP0W1Ljm/DN8OmR9oraleik03Uh8QMjm8IZy 2vlAmU2KXxEIyr0yTodN94lUviIrliz+ke8Sip6OlENa192N1xB2Yu7DpbaBhBxMlYZ7 j6xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JxeS4ykx8M13NNPGaiBn3H7mUrjFA6EZUfNxxGq0Uzg=; b=qd5tm8EwcMk0bQClTcangvcwwkeIcx9KWTtXs+iP+tK6Iw9skJAKvFAn/a33VPTi5t 43ds+kuNEgMwzJbEqvvie0h6UfgDYgCFhDREpiH/Jr/jKfPTi4FTqgKsFC/vTOqt0CeY UiBuuxzQFtKYFTjc9/t6Oru5bH3gM9dEm2E7V2hS48oIs3aX5C6MiXkZTgfOAPgWRGi4 OhxkYYryLTuDEUNYPA3CEAa2E8f8rNzlftX7lCwKJCBix+bNWQYD/r9+ZkcfguYHDvQL 2+Mb5VSS2tKOuLppppdyI9BnUNKNM7RVGP65DHoxikYGq9Q3K+ZL/dRVapS5VD1OSA+B ZSiw== X-Gm-Message-State: AOAM533myFB37QeRTVoywH/yO1qf2UaPq5XMECiKEjBKrCNzXPPvHPEM nCjJunVDB56AiP7K61MVEtFek+JKipBiGw== X-Google-Smtp-Source: ABdhPJwZ24y0JoaNoyKky+DU/4m4VsJhlWZPnnDNiY5h+nnccDX25bYArHTL0+7edfvv0AFqhfTz6A== X-Received: by 2002:a17:90a:ea91:: with SMTP id h17mr3320544pjz.66.1615877222621; Mon, 15 Mar 2021 23:47:02 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:02 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:06 -0700 Message-Id: <20210316064511.2891553-13-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches This makes powerpc64le-linux a supported architecture for Guix, but not for Guix System. * Makefile.am (SUPPORTED_SYSTEMS): Add an entry for powerpc64le-linux. * etc/guix-install.sh (chk_sys_arch): Same. * guix/packages.scm (%supported-systems): Same. * m4/guix.m4 (GUIX_ASSERT_SUPPORTED_SYSTEM): Same. * tests/guix-build.sh (all_systems): Same. --- Makefile.am | 4 +++- etc/guix-install.sh | 4 ++++ guix/packages.scm | 4 +++- m4/guix.m4 | 3 ++- tests/guix-build.sh | 6 ++++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index f40d9509bee..1c2d45527c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong # Copyright © 2019 Efraim Flashner +# Copyright © 2021 Chris Marusich # # This file is part of GNU Guix. # @@ -799,7 +800,8 @@ SOURCE_TARBALLS = \ $(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext)) # Systems supported by Guix. -SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux +SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \ + powerpc64le-linux # Guix binary tarballs. BINARY_TARBALLS = \ diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 94c04aa646a..c84e7b75779 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -8,6 +8,7 @@ # Copyright © 2020 Simon Tournier # Copyright © 2020 Daniel Brooks # Copyright © 2021 Jakub Kądziołka +# Copyright © 2021 Chris Marusich # # This file is part of GNU Guix. # @@ -187,6 +188,9 @@ chk_sys_arch() armv7l) local arch=armhf ;; + ppc64le | powerpc64le) + local arch=powerpc64le + ;; *) _err "${ERR}Unsupported CPU type: ${arch}" exit 1 diff --git a/guix/packages.scm b/guix/packages.scm index a057a88c638..55e5e70b8c6 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -345,7 +346,8 @@ name of its URI." (define %supported-systems ;; This is the list of system types that are supported. By default, we ;; expect all packages to build successfully here. - '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu")) + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "mips64el-linux" "i586-gnu" + "powerpc64le-linux")) (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. diff --git a/m4/guix.m4 b/m4/guix.m4 index c1ce0876fa0..f0d85a28d6d 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -2,6 +2,7 @@ dnl GNU Guix --- Functional package management for GNU dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Courtès dnl Copyright © 2014 Mark H Weaver dnl Copyright © 2017 Efraim Flashner +dnl Copyright © 2021 Chris Marusich dnl dnl This file is part of GNU Guix. dnl @@ -88,7 +89,7 @@ courageous and port the GNU System distribution to it (see # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in - x86_64-linux|i686-linux|armhf-linux|aarch64-linux) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux) ;; *) if test "x$guix_courageous" = "xyes"; then diff --git a/tests/guix-build.sh b/tests/guix-build.sh index b7602e668c4..e20702c521b 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # Copyright © 2020 Marius Bakke +# Copyright © 2021 Chris Marusich # # This file is part of GNU Guix. # @@ -61,8 +62,9 @@ guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' test `guix build sed -s x86_64-linux -d | wc -l` = 1 # Passing multiple '-s' flags. -all_systems="-s x86_64-linux -s i686-linux -s armhf-linux -s aarch64-linux" -test `guix build sed $all_systems -d | sort -u | wc -l` = 4 +all_systems="-s x86_64-linux -s i686-linux -s armhf-linux -s aarch64-linux \ +-s powerpc64le-linux" +test `guix build sed $all_systems -d | sort -u | wc -l` = 5 # Check there's no weird memoization effect leading to erroneous results. # See . From patchwork Tue Mar 16 06:45:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27876 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 AF98827BC54; Tue, 16 Mar 2021 06:49:13 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID 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 5668A27BC52 for ; Tue, 16 Mar 2021 06:49:13 +0000 (GMT) Received: from localhost ([::1]:57698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Vw-0004R3-1p for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0003Cb-UY for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Us-0005aw-Lk for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Us-0001gJ-Kf for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 14/18] syscalls: Fix clone on powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772466307 (code B ref 47182); Tue, 16 Mar 2021 06:48:06 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:26 +0000 Received: from localhost ([127.0.0.1]:37922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UE-0001dZ-C1 for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:26 -0400 Received: from mail-pf1-f181.google.com ([209.85.210.181]:34851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tx-0001aq-Nn for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:10 -0400 Received: by mail-pf1-f181.google.com with SMTP id y67so8158673pfb.2 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OtP2ZPAMVVkd1iE9n5O3zqQ33AZzqgzRsAfvV7IFX4M=; b=NHioZ9w1Prur25DM2Px4q5EmMeSVJzoR7+VBRCtMoW0ELZYiAfiZS6e604nYGHxvz8 Erjm/DK/RZidxOZoPRJ/MNdkv1ZpbOcTtdZY5TmYxv1QOxpblbgIBp03DK1BvTvbVF8U sjbDPEA0ZYwZQPjaFPOT6ukCL8f+KS0wv6hNTmwwQgMsK3Tv0JRatFILXE4Irg/c9fpG AXmc0CpDM8l/IB363DTyOxKY94iEDQ9GNm1ZbScmbWHGagzWlezg6RH31NX/A1tRhm+9 bOBS4aOT8uODDmK31D/6DSph2elOAWRpXr7y4E10Y7TjQ1EueSJ5J5nregSM+318kecz SwPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OtP2ZPAMVVkd1iE9n5O3zqQ33AZzqgzRsAfvV7IFX4M=; b=OHb9QZ4kf3P4MqffILilqrHm5/uw2cd2JplEFuiOHngMTy33zWfVXsNph6GORhAY+Q 9+4YhmmOygv6t3k56A6/O9PSDi2rI6zyXX6E+++d+VeWmDMFsgmoLuhP1aiyGXs5z5Za Ke8iFDsAUTRDZbxOG/2hNAu+uM6CjK4HZjQVIMUhqHh794tgLMC1u0o11+fCite7fpXI Wv+SA4GmcjdUAUFkRvaDXpYYU61s+OdfYn1O24tgLsp9yHplAowwduLRwBdcyQ1eI2dP w0e3RH9IWTXYaTo9J2l3bXs7LFi5RLM+t0+kABahf4H+AJxdnoertpvjiVkLZ8BPcFXH hR8g== X-Gm-Message-State: AOAM533z6d9uyLUJQc6c1SXAp1NsOycNURdqJ6q7xNAceDV6pDwAXOrV dr+6uYp/L6lED4eQxgBm5O7H9H82ikd8qQ== X-Google-Smtp-Source: ABdhPJzqhgvQcHt9Xh7xrb7agg6ec5ch9EBw1eEornDnyODpYKTdjdGjakBMMhKKRPF+3/m2tAJD6g== X-Received: by 2002:a63:4709:: with SMTP id u9mr2602344pga.250.1615877223657; Mon, 15 Mar 2021 23:47:03 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:03 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:07 -0700 Message-Id: <20210316064511.2891553-14-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches This makes the clone procedure work correctly and fixes some test failures on powerpc64le-linux, including tests/containers.scm. * guix/build/syscalls.scm (clone): Add an entry for ppc64le. --- guix/build/syscalls.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 4379768f5e3..a2c1d80fb1a 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1021,6 +1021,7 @@ Turning finalization off shuts down the finalization thread as a side effect." ("mips64" 5055) ("armv7l" 120) ("aarch64" 220) + ("ppc64le" 120) (_ #f)))) (lambda (flags) "Create a new child process by duplicating the current parent process. From patchwork Tue Mar 16 06:45:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27871 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 E53AF27BC54; Tue, 16 Mar 2021 06:48:34 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 709B227BC52 for ; Tue, 16 Mar 2021 06:48:34 +0000 (GMT) Received: from localhost ([::1]:55748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3VJ-0003bL-KL for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0003Dl-BH for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0005bL-1m for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ut-0001gQ-0l for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 15/18] syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772476314 (code B ref 47182); Tue, 16 Mar 2021 06:48:06 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:27 +0000 Received: from localhost ([127.0.0.1]:37924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UE-0001dg-Kk for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:26 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:33382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Ty-0001b6-Ir for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:11 -0400 Received: by mail-pl1-f176.google.com with SMTP id c16so16503824ply.0 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=of8ir6BkT+HxSxgSQsY3L87NvlxvWlvIZjpyYfe0QfA=; b=ghQrtAPYSHWYj2f/ZP6u69RyG7CeOhOCo1SJY/CFmntprviHtsFClZs5IXVx7ZxQBx +OxacmUz64tkurnbVBwoXr+O9V2udTC7uV1F7nbQDbAQkxCDJ9v8C44+NCwmnTY47Zr4 oi49ggIXrCifTVRMeAq67kXJehTbLAwta12fy8udgFO7+Ap5jqERH7pSFHJwUDBVLd+a Bnkxo3VXIBYFqX41fmub+VHWVsTrZncfYuE8biPHnR1C9ZOTHTf1LN+u1329OlS1X9wC VyALGeKeqaKkTe2v5iyxQkstb1U0q0AZFVw5JHlHxO7q9E4+2SjYmLpnmX70u3lZNBkQ tq2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=of8ir6BkT+HxSxgSQsY3L87NvlxvWlvIZjpyYfe0QfA=; b=UihwIktkVMhfuBjf/Bm1ff7VPCOXIjozsw8D6n17ciFLSAHeHRoarUnciISaeXRGki jsGtsM7RZEy7kf2N7HJqWSH5Vz4OVRRD2WGmPwEGco9WE9gNVtUgjT34W6uZqlcyU+Rk nC7zA+BFfryYteMgOaeXMQDKmgegxRne0ZgpozwKrTKaO3/B/evwBIyyzscUFo/cDJwG IWKbCcjJ/fZE1GZKvt6YRoainKgfN4LWBJUSw2a5l7bkGxkOgJyRFqkdYZ4hKj042ZeC lAxZg3j9pv7NOwZAqlAjdYhdyQsdpGxbAQP9OHjavgeeTHZYkhpKkaAE6b7lJYNrNuO3 wVRQ== X-Gm-Message-State: AOAM533O9QveDCspSBQbvQmWSv2xGDcYRi9bM6mASW+BO89wBJJ8UhH6 0eCNwKW+711xdpgeRdk/QOoHsdbUgTyeQA== X-Google-Smtp-Source: ABdhPJyqVZ4PGD82eLUGBPOUIJFFISqTiMVaKMIrTDmgrkxArzYg1tVCDnBj8QIIryCUsdkloYcz4Q== X-Received: by 2002:a17:902:9306:b029:e6:ac65:468e with SMTP id bc6-20020a1709029306b02900e6ac65468emr10534154plb.16.1615877224495; Mon, 15 Mar 2021 23:47:04 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:04 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:08 -0700 Message-Id: <20210316064511.2891553-15-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches This fixes the failing test add-to-entropy-count in tests/syscalls.scm on powerpc64le-linux. * guix/build/syscalls.scm (RNDADDTOENTCNT): When %host-type starts with "powerpc64le", set this to #x80045201. Otherwise, set it to #x40045201 as before. --- guix/build/syscalls.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index a2c1d80fb1a..8886fc0fb94 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -942,7 +943,11 @@ backend device." ;;; ;; From . -(define RNDADDTOENTCNT #x40045201) +(define RNDADDTOENTCNT + ;; Avoid using %current-system here to avoid depending on host-side code. + (if (string-prefix? "powerpc64le" %host-type) + #x80045201 + #x40045201)) (define (add-to-entropy-count port-or-fd n) "Add N to the kernel's entropy count (the value that can be read from From patchwork Tue Mar 16 06:45:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27874 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 C222227BC52; Tue, 16 Mar 2021 06:48:54 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID 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 5C28227BC54 for ; Tue, 16 Mar 2021 06:48:54 +0000 (GMT) Received: from localhost ([::1]:56566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Vd-0003xA-IP for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:48:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0003E5-Mz for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54630) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0005bT-ET for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ut-0001gX-Ck for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 16/18] ci: %cross-targets: Add powerpc64le-linux-gnu. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772476321 (code B ref 47182); Tue, 16 Mar 2021 06:48:07 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:27 +0000 Received: from localhost ([127.0.0.1]:37926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UE-0001dn-UV for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:27 -0400 Received: from mail-pj1-f52.google.com ([209.85.216.52]:44764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3Tz-0001b8-Bp for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:11 -0400 Received: by mail-pj1-f52.google.com with SMTP id kk2-20020a17090b4a02b02900c777aa746fso902811pjb.3 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+V9MV0V5wqm5YxDbQiFhd39HmX8mA7jiTqekPdsABN0=; b=QzXZl1MwPyVrkOI82hJHal6KvKjo8W1aTcYPGj3mHjOHdQT6oLqA3CU02HUssshcQU j7GYpPv3JA53XSHU5gOOfwaKArxZ9iSKhxujhcYvHb6SUSEqfgPoRU7bDtyQCvtjyMGQ tKTiKc8F7LnLeo+HB3S9Rzd6W30X9w9NRbrFFwi583g/LKicQilptsPlECOwGAX77DO2 XF8g3ZW0Tc1H0In5yIKxPs9dLevpNu2iYccPiQZf+iD0RHNim5hRPNOO4UhYFNM0LEdS 1v3VV2+2TiSxGNu4SPuP2ywZQtqWCA6VKEyw/eik1iWeVngLf0VScL+HkubqPwdEK64D MxPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+V9MV0V5wqm5YxDbQiFhd39HmX8mA7jiTqekPdsABN0=; b=oRoTirdO2ZsuZ4SNY0CBpzL6Ms9t3yoMOdmG9/Y3DJD2Km6ygGXOi1aP2XXU36sExn dIQoifNQFsD8KXwTI8+9R4IS2rDvtF8CmcuOcNuzdL09m+wEX6kON1kFesCnYTod1Lqk IIO6mApyBtScQa63mptYGNDpVVSVGLn27WbS0bjcwXx2plfYRNEktzPm+Gp6O3ItGMHr UqsuWHqWqAbK/ksCQq16rMABwxjDjkR4ch94I8D2QSqIZBbGP9MyMIu2DTj3fFRWqGUv 10HqJ9QOpVKOrAw9eA720xqBiGRnJI4nT/dU6vh3b8CsvwJgcwguIheLyG1ZMMMO1olU WU0g== X-Gm-Message-State: AOAM532h9zBsIGu4s+jOew1HRT2LSmoMn2rSObhwpCWLjHJMoCx0yqwq M9BiS0yXXCBfvsKe3kD4FJdIDldBMmDG+A== X-Google-Smtp-Source: ABdhPJy42xr8wQ7mHnGewRSO+Loa0y+1nP8M0Irjy6qUFnkzmZRcqJC5iK1sJ7wccdJzGwrAp889eg== X-Received: by 2002:a17:902:bf92:b029:e6:bc0:25ac with SMTP id v18-20020a170902bf92b02900e60bc025acmr15903425pls.49.1615877225400; Mon, 15 Mar 2021 23:47:05 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:04 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:09 -0700 Message-Id: <20210316064511.2891553-16-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches * gnu/ci.scm (%cross-targets): Add an entry for powerpc64le-linux-gnu. --- gnu/ci.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/ci.scm b/gnu/ci.scm index acd05a18b47..eb07e69a179 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -156,6 +156,7 @@ SYSTEM." "arm-linux-gnueabihf" "aarch64-linux-gnu" "powerpc-linux-gnu" + "powerpc64le-linux-gnu" "riscv64-linux-gnu" "i586-pc-gnu" ;aka. GNU/Hurd "i686-w64-mingw32" From patchwork Tue Mar 16 06:45:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27880 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 F14FC27BC54; Tue, 16 Mar 2021 06:49:52 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID 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 9FE2A27BC52 for ; Tue, 16 Mar 2021 06:49:52 +0000 (GMT) Received: from localhost ([::1]:59214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3WZ-000549-Qa for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uu-0003FD-4n for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Ut-0005be-Qf for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Ut-0001gg-Oy for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 17/18] utils: Fix target-64bit? on powerpc64le-linux. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772476329 (code B ref 47182); Tue, 16 Mar 2021 06:48:07 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:27 +0000 Received: from localhost ([127.0.0.1]:37928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UF-0001du-6o for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:27 -0400 Received: from mail-pf1-f175.google.com ([209.85.210.175]:45157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U0-0001bG-Eh for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:12 -0400 Received: by mail-pf1-f175.google.com with SMTP id c17so4561376pfv.12 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xo/ii5GXpe22mi4WtcM7dLqvva7GmmO8RUU5VqIRKvk=; b=tOULTUPnNzz5F2iLKQ7DDOuqlJ0gXn6vu1p9bJmMpmqccz87RK00zVcaBgSfAVMkVY eUNggsTw3W6Z8a43K3dxZAVTJ3DwY5Kpb36D/+poBQtruu2x09SkLqBhJRai+1bkTHcr HpYSaubban0sUd/U1arAlxL9NjfsyoAX5RMsIjIFF1JtFmK3dnpopmCT85XTQxYZ5uDC HjhJ0paQmocQHhrmoUIsuHzQqE+NrYH5C9WoJNNcUk00SdzeCZF3mC6SA0gibVVDuzSN 6HA8XEXhNpxI5t35AU/aZ1TYHVsCLClrocQ3em8So5DJeheIC01I6gf5Pp4gCBlqmfbe PlIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xo/ii5GXpe22mi4WtcM7dLqvva7GmmO8RUU5VqIRKvk=; b=IyKmbN+KDZk6FnzHwBlyj8ephB7SdljE7vWUU06nE2W2HojNzFZnTreyNOCtOTaW2U QurJHL3CuufQEtjL8DQS0LCS1HsvoC1ZfI/9m4E9ulrGeyJrzrWn807D3RyJsrYuOsni xwZC0q7202rcez5gLFdha8slLjrffIydnfzg2ikj1O0rysKpfkssVekCy45bDkxNhApn 5H7RJMC2rJboE4V8fPUPDUJBCAHzOZj2gUDn3CVnsoH/XAGSccvvVME2ijoZpruV5BSK XyhSfBZPnknhQ6pGcH6m4965TCNzRDtegbipwjfhxNITcb2ZQ7D2HIHfU5mVujPYv15m eOtg== X-Gm-Message-State: AOAM530f1N5i6h/3Di1DFaFED0gliYb92PnhLQcENjiz0VMXC1wU2EF5 Y4FSawrX+nOJ3az9AFbTXNQxrTr5IBpgNA== X-Google-Smtp-Source: ABdhPJxs1EPYxGE606s7oJIMgVXcqE3wYBR7X1OcUkaqYgQOygPVmcaDF9+TlFwGLH4gn9SMbOBxew== X-Received: by 2002:a63:5622:: with SMTP id k34mr2645518pgb.226.1615877226407; Mon, 15 Mar 2021 23:47:06 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:05 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:10 -0700 Message-Id: <20210316064511.2891553-17-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-64bit?): Change the string from "ppc64" to "powerpc64", which matches Guix system names like "powerpc64le-linux". --- guix/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/utils.scm b/guix/utils.scm index fc57620319e..2dd1ddeb8a7 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -549,7 +549,7 @@ a character other than '@'." (define* (target-64bit? #:optional (system (or (%current-target-system) (%current-system)))) - (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))) + (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "powerpc64"))) (define* (cc-for-target #:optional (target (%current-target-system))) (if target From patchwork Tue Mar 16 06:45:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 27881 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 8FD0827BC54; Tue, 16 Mar 2021 06:49:59 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 02A2827BC52 for ; Tue, 16 Mar 2021 06:49:59 +0000 (GMT) Received: from localhost ([::1]:59638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM3Wg-0005Fz-6Y for patchwork@mira.cbaines.net; Tue, 16 Mar 2021 02:49:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM3Uu-0003GG-Fb for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM3Uu-0005c0-6E for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lM3Uu-0001gn-4p for guix-patches@gnu.org; Tue, 16 Mar 2021 02:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47182] [PATCH 18/18] gnu: sed: Make it build on SELinux-enabled kernels. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 06:48:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47182@debbugs.gnu.org Cc: Chris Marusich Received: via spool by 47182-submit@debbugs.gnu.org id=B47182.16158772476335 (code B ref 47182); Tue, 16 Mar 2021 06:48:08 +0000 Received: (at 47182) by debbugs.gnu.org; 16 Mar 2021 06:47:27 +0000 Received: from localhost ([127.0.0.1]:37930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3UF-0001e2-Er for submit@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:27 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:43580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lM3U1-0001bJ-8p for 47182@debbugs.gnu.org; Tue, 16 Mar 2021 02:47:13 -0400 Received: by mail-pg1-f169.google.com with SMTP id n10so21966938pgl.10 for <47182@debbugs.gnu.org>; Mon, 15 Mar 2021 23:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uBIQVZI2jrbcjIl6qmJMJm7AHQfJWiPonNfGzXy8W0Y=; b=qNEAzEdHOPwya5d/tbKvkXG6Rpuh0Tio/WZaS/zvtLyKbQtl2bUlUVTWCHsFTDSuhb sH/k9MczpkTs0L001BURrv+wCe+PEPANfkgNM/l+29G0KeXdQAQrZRTXE98P7rUMKsa5 s1s2g8pHCZA64+KbqOfBTFO3EN+Q79aJK6KNNWkWVkbuwvs2z1sGzlOy7GaPiOOmk9f9 l1n/JkBT/IYafdmxWv9185G7YGdBaIufI5Gt9xhvrFLnUxvQRajR+x7DrEVH62ZNGdhz +K6Jl+D6ekuxbyR2iJdzJSI3mgXKM43zwqJYGDig05mphcSOLLN+1yXU0ObqAzI+semh cxug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uBIQVZI2jrbcjIl6qmJMJm7AHQfJWiPonNfGzXy8W0Y=; b=Yi2RglcyUKFyCtt9qhob03yKfTIZpqAO2iLBjETH/sU9D4/41EZd0LiVxDoJyxXcFw hWJUoil9zNCkCCVHJASpVtc2klKQfPT3RAWXjKmEaYRbBMbrEDa+ufgXBvoqY2stKPNe Tk9EiWuLgOjNBhlllALbDs8ifIBUUicNINIMQIvq7VB0HhD7JebVb58glz66J8TRBal5 VpYSCyV4rJNjwWiquMTzAk7GbhA/KYoaO2XEqEdvtSJwP8howhnxgUSG/xLD5KrQwz2d PRSqzlerCfeLdvpsC+/SmO/iHQyGmc09ajRMqJd3qsq8QvDTHw19AZB0FUrfuz26SwkC 8PPg== X-Gm-Message-State: AOAM532/eRdt/np4B3lnmXKLNmPzvnuIPE5/eUyke5N0B42sk1ZAhoFG MqGNQxPGaJml91XttJrTuAbOD6anAsqIdw== X-Google-Smtp-Source: ABdhPJxNy8N6OMwMX6FBiof1bCl+0Xyug9EFApOjyRnUCZQVw/oQD6K/PppUSQ4fdmqUqkYPeFkbDg== X-Received: by 2002:a63:224c:: with SMTP id t12mr2562903pgm.289.1615877227261; Mon, 15 Mar 2021 23:47:07 -0700 (PDT) Received: from garuda-lan.lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id r186sm15541160pfr.124.2021.03.15.23.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 23:47:06 -0700 (PDT) From: Chris Marusich Date: Mon, 15 Mar 2021 23:45:11 -0700 Message-Id: <20210316064511.2891553-18-cmmarusich@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com> References: <20210316062805.2890883-1-cmmarusich@gmail.com> <20210316064511.2891553-1-cmmarusich@gmail.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" X-getmail-retrieved-from-mailbox: Patches Fixes: . * gnu/packages/base.scm (sed)[arguments]: New field. This adds a snippet, equivalent to the patch submitted upstream, which fixes an issue that prevents sed from building on SELinux-enabled kernels. Adjusted by Efraim Flashner to apply to master. --- gnu/packages/base.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7c5ac61f01c..f0f93533986 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -148,6 +148,22 @@ including, for example, recursive directory searching.") (base32 "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")))) (build-system gnu-build-system) + (arguments + ;; TODO: When merging this into core-updates, keep the version of + ;; this code (with comment!) applied as a snippet. + `(,@(if (string-prefix? "powerpc64le" (or (%current-target-system) + (%current-system))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'allow-building-on-selinux-systems + (lambda _ + (substitute* "Makefile.in" + (("^ abs_srcdir='\\$\\(abs_srcdir\\)'.*" previous-line) + (string-append + previous-line + " CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n"))) + #t)))) + '()))) (synopsis "Stream editor") (native-inputs `(("perl" ,perl))) ;for tests