From patchwork Tue Aug 17 10:18:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32144 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 83E7727BC78; Tue, 17 Aug 2021 11:22:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 5E87B27BC6B for ; Tue, 17 Aug 2021 11:22:09 +0100 (BST) Received: from localhost ([::1]:54694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwES-0000m4-Gr for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:22:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwEM-0000lv-53 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwEL-0003Y6-Uj for guix-patches@gnu.org; Tue, 17 Aug 2021 06:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwEL-0003zm-Rb for guix-patches@gnu.org; Tue, 17 Aug 2021 06:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 01/21] utils: Define 'target-riscv?' predicate. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919569815328 (code B ref 50091); Tue, 17 Aug 2021 10:22:01 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:21:38 +0000 Received: from localhost ([127.0.0.1]:51765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwDy-0003zA-9b for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:21:38 -0400 Received: from flashner.co.il ([178.62.234.194]:45894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwDt-0003yu-Ey for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:21:37 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 6D171402E0; Tue, 17 Aug 2021 10:21:27 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:18:59 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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-riscv?): New predicate. --- guix/utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 32fcff72ea..134879feb1 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -96,6 +96,7 @@ target-arm? target-ppc32? target-powerpc? + target-riscv? target-64bit? cc-for-target cxx-for-target @@ -699,6 +700,11 @@ architecture (x86_64)?" (%current-system)))) (string-prefix? "powerpc" target)) +(define* (target-riscv? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET a 'riscv' architecture variant?" + (string-prefix? "riscv" target)) + (define* (target-64bit? #:optional (system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "powerpc64"))) From patchwork Tue Aug 17 10:19:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32146 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 1037527BC78; Tue, 17 Aug 2021 11:23:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 59CD627BC6B for ; Tue, 17 Aug 2021 11:23:46 +0100 (BST) Received: from localhost ([::1]:57676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwG1-0002me-F1 for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:23:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwFK-0001gj-Js for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwFK-0004Po-Cd for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwFK-00042B-8r for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 02/21] gnu: bootstrap: Add support for riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919573615411 (code B ref 50091); Tue, 17 Aug 2021 10:23:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:22:16 +0000 Received: from localhost ([127.0.0.1]:51769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwEZ-00040V-HK for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:22:16 -0400 Received: from flashner.co.il ([178.62.234.194]:45898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwEX-000409-Mf for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:22:14 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id D562D402E0; Tue, 17 Aug 2021 10:22:07 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:00 +0300 Message-Id: <049e686bea6f7f4186fbc6da38315f707763bf3f.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 On 7d93b21ab1c132990054372a9677c1639d54e631 gnu: glibc-for-bootstrap: Update patch. Run ./pre-inst-env guix build --target=riscv64-linux-gnu bootstrap-tarballs Producing /gnu/store/4hdzva9i0wyyfbgj1lmqc1wkk644pv07-bootstrap-tarballs-0 With guix hash -rx 1nj0fdgj08bbmfny01mp2blv7c3p2iciqh31zmf04ap5s7ygsqlp * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for riscv64-linux. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for riscv64-linux. (raw-build-guile3): New procedure. (make-raw-bag): Use raw-build-guile3 for riscv64-linux. * gnu/packages/commencement.scm (findutils-boot0)[arguments]: Don't override TIME_T_32_BIT_OK on riscv64-linux. * guix/packages.scm (%supported-systems): Add riscv64-linux. (%cuirass-supported-systems): Remove riscv64-linux. * guix/utils.scm (target-64bit?): Add riscv64-linux. * m4/guix.m4: Add riscv64-linux as a supported system. --- gnu/packages/bootstrap.scm | 112 +++++++++++++++++++++++++++++++++- gnu/packages/commencement.scm | 4 +- guix/packages.scm | 4 +- guix/utils.scm | 3 +- m4/guix.m4 | 4 +- 5 files changed, 118 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 5a8028a465..260c1b5b91 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -144,7 +144,16 @@ ("tar" ,(base32 "150c8948cz8r208g6qgn2dn4f4zs5kpgbpbg6bwag6yw42rapw2l")) ("xz" - ,(base32 "0v5738idy9pqzcbrjdpxi5c6qs5m78zrpsydmrpx5cfcfzbkxzjh"))))) + ,(base32 "0v5738idy9pqzcbrjdpxi5c6qs5m78zrpsydmrpx5cfcfzbkxzjh"))) + ("riscv64-linux" + ("bash" + ,(base32 "0almlf73k6hbm495kzf4bw1rzsg5qddn7z2rf5l3d1xcapac2hj3")) + ("mkdir" + ,(base32 "0rg1amdcqfkplcy1608jignl8jq0wqzfkp430mwik3f62959gya6")) + ("tar" + ,(base32 "17d3x27qhiwk7h6ns0xrvbrq0frxz89mjjh2cdwx2rraq5x6wffm")) + ("xz" + ,(base32 "0nxn75xf386vdq3igmgm8gnyk4h4x0cm8jv71vlb2jvwxh0cyw1q"))))) (define %bootstrap-executable-base-urls ;; This is where the bootstrap executables come from. @@ -159,6 +168,7 @@ ("powerpc64le-linux" (string-append system "/20210106/" program)) ("i586-gnu" (string-append system "/20200326/" program)) ("powerpc-linux" (string-append system "/20200923/bin/" program)) + ("riscv64-linux" (string-append system "/20210725/bin/" program)) (_ (string-append system "/" program "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) @@ -362,6 +372,8 @@ or false to signal an error." "/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") + ("riscv64-linux" + "/20210725/guile-3.0.2.tar.xz") (_ "/20131110/guile-2.0.9.tar.xz")))) @@ -383,7 +395,9 @@ or false to signal an error." ("i586-gnu" (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) ("powerpc-linux" - (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")))) + (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")) + ("riscv64-linux" + (base32 "12pqmhsbbp7hh9r1bjdl14l3a4q06plpz6dcks9dysb4czay8p9f")))) (define (bootstrap-guile-origin system) "Return an object for the Guile tarball of SYSTEM." @@ -455,6 +469,76 @@ GUILE_SYSTEM_PATH=$out/share/guile/2.0 \ GUILE_SYSTEM_COMPILED_PATH=$out/lib/guile/2.0/ccache \ $out/bin/guile -c ~s $out ~a +# Sanity check. +$out/bin/guile --version~%" + (derivation->output-path mkdir) + (derivation->output-path xz) + (derivation->output-path tar) + (object->string wrapper) + (derivation->output-path bash))))) + (raw-derivation name + (derivation->output-path bash) `(,builder) + #:system system + #:inputs (map derivation-input + (list bash mkdir tar xz guile)) + #:sources (list builder) + #:env-vars `(("GUILE_TARBALL" + . ,(derivation->output-path guile)))))) + +(define* (raw-build-guile3 name inputs + #:key outputs system search-paths + #:allow-other-keys) + (define (->store file) + (lower-object (bootstrap-executable file system) + system)) + + (define (make-guile-wrapper bash guile-real) + ;; The following code, run by the bootstrap guile after it is unpacked, + ;; creates a wrapper for itself to set its load path. This replaces the + ;; previous non-portable method based on reading the /proc/self/exe + ;; symlink. + '(begin + (use-modules (ice-9 match)) + (match (command-line) + ((_ out bash) + (let ((bin-dir (string-append out "/bin")) + (guile (string-append out "/bin/guile")) + (guile-real (string-append out "/bin/.guile-real")) + ;; We must avoid using a bare dollar sign in this code, + ;; because it would be interpreted by the shell. + (dollar (string (integer->char 36)))) + (chmod bin-dir #o755) + (rename-file guile guile-real) + (call-with-output-file guile + (lambda (p) + (format p "\ +#!~a +export GUILE_SYSTEM_PATH=~a/share/guile/3.0 +export GUILE_SYSTEM_COMPILED_PATH=~a/lib/guile/3.0/ccache +exec -a \"~a0\" ~a \"~a@\"\n" + bash out out dollar guile-real dollar))) + (chmod guile #o555) + (chmod bin-dir #o555)))))) + + (mlet* %store-monad ((tar (->store "tar")) + (xz (->store "xz")) + (mkdir (->store "mkdir")) + (bash (->store "bash")) + (guile (download-bootstrap-guile system)) + (wrapper -> (make-guile-wrapper bash guile)) + (builder + (text-file "build-bootstrap-guile.sh" + (format #f " +echo \"unpacking bootstrap Guile to '$out'...\" +~a $out +cd $out +~a -dc < $GUILE_TARBALL | ~a xv + +# Use the bootstrap guile to create its own wrapper to set the load path. +GUILE_SYSTEM_PATH=$out/share/guile/3.0 \ +GUILE_SYSTEM_COMPILED_PATH=$out/lib/guile/3.0/ccache \ +$out/bin/guile -c ~s $out ~a + # Sanity check. $out/bin/guile --version~%" (derivation->output-path mkdir) @@ -478,7 +562,9 @@ $out/bin/guile --version~%" (name name) (system system) (build-inputs inputs) - (build raw-build))) + (build (cond ((target-riscv?) + raw-build-guile3) + (else raw-build))))) (define %bootstrap-guile ;; The Guile used to run the build scripts of the initial derivations. @@ -518,6 +604,8 @@ $out/bin/guile --version~%" "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/static-binaries.tar.xz") + ("riscv64-linux" + "/20210725/static-binaries.tar.xz") (_ "/20131110/static-binaries.tar.xz"))) %bootstrap-base-urls)) @@ -544,6 +632,9 @@ $out/bin/guile --version~%" ("powerpc-linux" (base32 "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")) + ("riscv64-linux" + (base32 + "0x0xjlpmyh6rkr51p00gp6pscgl6zjida1rsg8vk3rinyi6rrbkg")) ("mips64el-linux" (base32 "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753")))))) @@ -596,6 +687,8 @@ $out/bin/guile --version~%" "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/binutils-2.35.1.tar.xz") + ("riscv64-linux" + "/20210725/binutils-2.34.tar.xz") (_ "/20131110/binutils-2.23.2.tar.xz"))) %bootstrap-base-urls)) @@ -616,6 +709,9 @@ $out/bin/guile --version~%" ("powerpc64le-linux" (base32 "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz")) + ("riscv64-linux" + (base32 + "0n9qf4vbilfmh1lknhw000waakj4q6s50pnjazr5137skm976z5m")) ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) @@ -681,6 +777,8 @@ $out/bin/guile --version~%" "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/glibc-2.32.tar.xz") + ("riscv64-linux" + "/20210725/glibc-2.31.tar.xz") (_ "/20131110/glibc-2.18.tar.xz"))) %bootstrap-base-urls)) @@ -701,6 +799,9 @@ $out/bin/guile --version~%" ("powerpc64le-linux" (base32 "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) + ("riscv64-linux" + (base32 + "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")) ("i586-gnu" (base32 "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) @@ -782,6 +883,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/gcc-5.5.0.tar.xz") + ("riscv64-linux" + "/20210725/gcc-7.5.0.tar.xz") (_ "/20131110/gcc-4.8.2.tar.xz"))) %bootstrap-base-urls)) @@ -802,6 +905,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("powerpc64le-linux" (base32 "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1")) + ("riscv64-linux" + (base32 + "1k4mbnb54wj2q37fgshf5dfixixqnhn002vhzvi9pnb57xb9v14d")) ("i586-gnu" (base32 "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dc9b372132..d395b261c2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2496,7 +2496,9 @@ exec " gcc "/bin/" program ,@(substitute-keyword-arguments (package-arguments findutils) ((#:configure-flags flags ''()) `(append - ,(if (target-64bit?) + ;; TODO: Figure out exactly with architectures need this. + ,(if (and (target-64bit?) + (not (target-riscv?))) ''("TIME_T_32_BIT_OK=yes") ''()) ,(match (%current-system) diff --git a/guix/packages.scm b/guix/packages.scm index 2349bb4340..7e86da9aae 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -366,7 +366,7 @@ name of its URI." ;; 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" - "powerpc64le-linux" "powerpc-linux")) + "powerpc64le-linux" "powerpc-linux" "riscv64-linux")) (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. @@ -377,7 +377,7 @@ name of its URI." ;; ;; XXX: MIPS is unavailable in CI: ;; . - (fold delete %supported-systems '("mips64el-linux" "powerpc-linux"))) + (fold delete %supported-systems '("mips64el-linux" "powerpc-linux" "riscv64-linux"))) (define-inlinable (sanitize-inputs inputs) "Sanitize INPUTS by turning it into a list of name/package tuples if it's diff --git a/guix/utils.scm b/guix/utils.scm index 134879feb1..3ca846f075 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -707,7 +707,8 @@ architecture (x86_64)?" (define* (target-64bit? #:optional (system (or (%current-target-system) (%current-system)))) - (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "powerpc64"))) + (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" + "powerpc64" "riscv64"))) (define* (cc-for-target #:optional (target (%current-target-system))) (if target diff --git a/m4/guix.m4 b/m4/guix.m4 index e778a56004..c79d3c3bc5 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,7 +1,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, 2020 Efraim Flashner +dnl Copyright © 2017, 2020, 2021 Efraim Flashner dnl Copyright © 2021 Chris Marusich dnl dnl This file is part of GNU Guix. @@ -89,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|powerpc64le-linux|powerpc-linux) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|powerpc-linux|riscv64-linux) ;; *) if test "x$guix_courageous" = "xyes"; then From patchwork Tue Aug 17 10:19:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32145 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 B593027BC78; Tue, 17 Aug 2021 11:23:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 80BAD27BC6B for ; Tue, 17 Aug 2021 11:23:10 +0100 (BST) Received: from localhost ([::1]:56118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwFR-0001kl-Iu for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:23:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwFL-0001ha-1S for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwFK-0004QM-Qk for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwFK-00042J-NC for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 03/21] gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919576715469 (code B ref 50091); Tue, 17 Aug 2021 10:23:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:22:47 +0000 Received: from localhost ([127.0.0.1]:51772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwF5-00041R-8O for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:22:47 -0400 Received: from flashner.co.il ([178.62.234.194]:45906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwF4-00041E-8R for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:22:46 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 83A79402E0; Tue, 17 Aug 2021 10:22:40 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:01 +0300 Message-Id: <9a13706d4a6835b5cc250ce3ab9653ee2117d33a.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 (libstdc++-boot0-gcc7): New variable. (gcc-boot0)[inputs]: On riscv64-linux use libstdc++-boot0-gcc7 instead of libstdc++-boot0. --- gnu/packages/commencement.scm | 48 ++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d395b261c2..69cf30483d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2703,6 +2703,50 @@ exec " gcc "/bin/" program (inputs (%boot0-inputs)) (native-inputs '())))) +(define libstdc++-boot0-gcc7 + ;; GCC >= 7 is needed by architectures which use C++-14 features. + (let ((lib (make-libstdc++ gcc-7))) + (package + (inherit lib) + (source (bootstrap-origin (package-source lib))) + (name "libstdc++-boot0") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + + ;; XXX: libstdc++.so NEEDs ld.so for some reason. + #:validate-runpath? #f + + ,@(substitute-keyword-arguments (package-arguments lib) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (invoke "tar" "xvf" source)) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-6.0 mpfr mpc)))))))))) + (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) + ("mpfr-source" ,(bootstrap-origin (package-source mpfr))) + ("mpc-source" ,(bootstrap-origin (package-source mpc))) + ,@(%boot0-inputs))) + (native-inputs '())))) + (define gcc-boot0 (package (inherit gcc) @@ -2814,7 +2858,9 @@ exec " gcc "/bin/" program ("binutils-cross" ,binutils-boot0) ;; The libstdc++ that libcc1 links against. - ("libstdc++" ,libstdc++-boot0) + ("libstdc++" ,(match (%current-system) + ("riscv64-linux" libstdc++-boot0-gcc7) + (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether ;; the "libc" input is #f. From patchwork Tue Aug 17 10:19:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32147 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 88AF727BC78; Tue, 17 Aug 2021 11:24:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 654A327BC6B for ; Tue, 17 Aug 2021 11:24:10 +0100 (BST) Received: from localhost ([::1]:58764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwGP-0003WV-Ec for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwGI-0003Ti-JK for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwGI-0005GY-AK for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwGI-00044H-66 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 04/21] gnu: %boot3-inputs: Add missing input. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919580015566 (code B ref 50091); Tue, 17 Aug 2021 10:24:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:23:20 +0000 Received: from localhost ([127.0.0.1]:51777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwFc-000430-JA for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:23:20 -0400 Received: from flashner.co.il ([178.62.234.194]:45910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwFa-00042o-TT for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:23:19 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 1C2B6402E0; Tue, 17 Aug 2021 10:23:13 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:02 +0300 Message-Id: <6e9d701fe2111c5c9dd74e1238f9a737a58b9c8d.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 (%boot3-inputs): Add gcc:lib. --- gnu/packages/commencement.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 69cf30483d..e2339170e5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3579,6 +3579,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) + ,@(if (target-riscv?) + `(("gcc:lib" ,gcc-final "lib")) + '()) ("ld-wrapper" ,ld-wrapper-boot3) ,@(alist-delete "gcc" (%boot2-inputs)))) From patchwork Tue Aug 17 10:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32148 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 4E37D27BC78; Tue, 17 Aug 2021 11:24:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 1BE8427BC6B for ; Tue, 17 Aug 2021 11:24:35 +0100 (BST) Received: from localhost ([::1]:59956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwGo-0004K4-7p for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:24:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwGI-0003UI-T0 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwGI-0005Gp-MJ for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwGI-00044P-Iu for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 05/21] gnu: guile: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919583315620 (code B ref 50091); Tue, 17 Aug 2021 10:24:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:23:53 +0000 Received: from localhost ([127.0.0.1]:51780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwG8-00043s-QL for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:23:53 -0400 Received: from flashner.co.il ([178.62.234.194]:45914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwG7-00043a-6m for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:23:51 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 8F35C402E0; Tue, 17 Aug 2021 10:23:45 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:03 +0300 Message-Id: <9440a6ca3c1318e99dc1eb16f7e382ee888464fc.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/guile.scm (guile-3.0)[arguments]: On riscv64-linux add a phase to skip a failing test. --- gnu/packages/guile.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index fffc30f913..f9a7125f83 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -65,7 +65,8 @@ #:use-module (guix deprecation) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module ((srfi srfi-1) #:prefix srfi-1:)) + #:use-module ((srfi srfi-1) #:prefix srfi-1:) + #:use-module (srfi srfi-26)) ;;; Commentary: ;;; @@ -346,14 +347,17 @@ without requiring the source code to be rewritten.") ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214 (substitute* "bootstrap/Makefile.in" (("^GUILE_OPTIMIZATIONS.*") - "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n")))) - (add-after 'unpack 'skip-failing-fdes-test - (lambda _ - ;; ERROR: ((system-error "seek" "~A" ("Bad file descriptor") (9))) - (substitute* "test-suite/tests/ports.test" - (("fdes not closed\"" all) (string-append all "(exit 77)"))) - #t))) - '()))))) + "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) + '()) + ,@(if (srfi-1:any (cute string-prefix? <> (%current-system)) + '("powerpc-" "riscv64-")) + `((add-after 'unpack 'skip-failing-fdes-test + (lambda _ + ;; ERROR: ((system-error "seek" "~A" ("Bad file descriptor") (9))) + (substitute* "test-suite/tests/ports.test" + (("fdes not closed\"" all) (string-append all "(exit 77)"))) + #t))) + '()))))) (native-search-paths (list (search-path-specification From patchwork Tue Aug 17 10:19:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32149 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 CED2427BC78; Tue, 17 Aug 2021 11:25:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 AC7F227BC6B for ; Tue, 17 Aug 2021 11:25:52 +0100 (BST) Received: from localhost ([::1]:60192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwI3-0004XH-Qh for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwHH-0004WZ-DW for guix-patches@gnu.org; Tue, 17 Aug 2021 06:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwHG-00068s-9H for guix-patches@gnu.org; Tue, 17 Aug 2021 06:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwHG-00046i-4C for guix-patches@gnu.org; Tue, 17 Aug 2021 06:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 06/21] gnu: %final-inputs: Add implied gcc:lib input. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919586515707 (code B ref 50091); Tue, 17 Aug 2021 10:25:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:24:25 +0000 Received: from localhost ([127.0.0.1]:51785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwGf-00045H-45 for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:24:25 -0400 Received: from flashner.co.il ([178.62.234.194]:45920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwGd-00044v-MG for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:24:23 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 0A98E402E0; Tue, 17 Aug 2021 10:24:17 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:04 +0300 Message-Id: <337c42e24c6a78adff7a64303a8e673d7c5f3536.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 (%final-inputs): Add gcc:lib. --- gnu/packages/commencement.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e2339170e5..b717604a9c 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3726,6 +3726,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("ld-wrapper" ,ld-wrapper) ("binutils" ,binutils-final) ("gcc" ,gcc-final) + ,@(if (target-riscv?) + `(("gcc:lib" ,gcc-final "lib")) + '()) ("libc" ,glibc-final) ("libc:static" ,glibc-final "static") ("locales" ,glibc-utf8-locales-final)))) From patchwork Tue Aug 17 10:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32150 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 C781A27BC78; Tue, 17 Aug 2021 11:26:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 7F18327BC6B for ; Tue, 17 Aug 2021 11:26:15 +0100 (BST) Received: from localhost ([::1]:60506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwIQ-0004ra-IZ for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwIF-0004oo-HM for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwIF-0007Dz-9P for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwIF-0004IA-61 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 07/21] gnu: bdb: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919590715857 (code B ref 50091); Tue, 17 Aug 2021 10:26:03 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:25:07 +0000 Received: from localhost ([127.0.0.1]:51793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwHG-00046r-HY for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:25:07 -0400 Received: from flashner.co.il ([178.62.234.194]:45924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwHA-00045u-5R for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:25:00 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 82A99402E0; Tue, 17 Aug 2021 10:24:50 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:05 +0300 Message-Id: <975888973eb4debf457d394fc3669a36168566ac.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/dbm.scm (bdb)[arguments]: Modify configure to build for the currect architecture when building for riscv64-linux. --- gnu/packages/dbm.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index ce84ef9eda..c2bdaf782a 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2016, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2020 Jakub Kądziołka @@ -28,7 +28,8 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (ice-9 match)) ;;; Commentary: ;;; @@ -72,15 +73,15 @@ (string-append "CONFIG_SHELL=" (which "bash")) (string-append "SHELL=" (which "bash")) - ;; Bdb doesn't recognize aarch64 as an architecture. - ,@(if (string=? "aarch64-linux" (%current-system)) - '("--build=aarch64-unknown-linux-gnu") - '()) - - ;; Bdb doesn't recognize powerpc64le as an architecture. - ,@(if (string=? "powerpc64le-linux" (%current-system)) - '("--build=powerpc64le-unknown-linux-gnu") - '()) + ;; Bdb doesn't recognize very many architectures. + ,@(match (%current-system) + ("aarch64-linux" + '("--build=aarch64-unknown-linux-gnu")) + ("powerpc64le-linux" + '("--build=powerpc64le-unknown-linux-gnu")) + ("riscv64-linux" + '("--build=riscv64-unknown-linux-gnu")) + (_ '())) ,@(if (%current-target-system) ; cross building '((string-append "--host=" target)) From patchwork Tue Aug 17 10:19:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32151 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 84CC927BC78; Tue, 17 Aug 2021 11:26:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 3EDCA27BC6B for ; Tue, 17 Aug 2021 11:26:45 +0100 (BST) Received: from localhost ([::1]:32980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwIo-0005LQ-WC for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:26:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwIF-0004p2-Sz for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40259) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwIF-0007EK-MG for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwIF-0004IH-Ij for guix-patches@gnu.org; Tue, 17 Aug 2021 06:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 08/21] gnu: elfutils: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919594116441 (code B ref 50091); Tue, 17 Aug 2021 10:26:03 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:25:41 +0000 Received: from localhost ([127.0.0.1]:51798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwHn-0004H0-N5 for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:25:41 -0400 Received: from flashner.co.il ([178.62.234.194]:45928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwHg-0004Gi-Og for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:25:33 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 0B0F7402E0; Tue, 17 Aug 2021 10:25:22 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:06 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/elf.scm (elfutils)[arguments]: On riscv64-linux add a phase to skip failing test. --- gnu/packages/elf.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 2bc1d00048..01e5f51b00 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Marius Bakke @@ -98,7 +98,14 @@ (lambda _ (substitute* "tests/Makefile.in" (("run-backtrace-native.sh") "")) - #t))))) + #t)) + ,@(if (target-riscv?) + `((add-after 'unpack 'disable-failing-riscv64-test + (lambda _ + ;; dwfl_thread_getframes: No DWARF information found + (substitute* "tests/Makefile.in" + (("run-backtrace-dwarf.sh") ""))))) + '())))) (native-inputs `(("m4" ,m4))) (inputs `(("zlib" ,zlib))) From patchwork Tue Aug 17 10:19:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32152 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 23C0727BC78; Tue, 17 Aug 2021 11:27:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 D806D27BC6B for ; Tue, 17 Aug 2021 11:27:14 +0100 (BST) Received: from localhost ([::1]:33294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwJN-0005dM-MN for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:27:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwJE-0005d6-0b for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwJC-00085s-1Q for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwJB-0004K2-U1 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 09/21] gnu: pcre: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919597216544 (code B ref 50091); Tue, 17 Aug 2021 10:27:01 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:26:12 +0000 Received: from localhost ([127.0.0.1]:51808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwIJ-0004Ii-Sh for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:26:12 -0400 Received: from flashner.co.il ([178.62.234.194]:45936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwID-0004HV-Fe for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:26:06 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 85247402E0; Tue, 17 Aug 2021 10:25:55 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:07 +0300 Message-Id: <874b6930d544e1f7179b98dbcb58aea84e143e70.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/pcre.scm (pcre)[arguments]: Adjust configure-flags to not build with JIT when building for riscv64-linux. --- gnu/packages/pcre.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 318727915e..315dd8be1d 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Ludovic Courtès -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2021 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Simon Tournier @@ -32,6 +32,7 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public pcre @@ -54,7 +55,7 @@ ("readline" ,readline) ("zlib" ,zlib))) (arguments - '(#:disallowed-references ("doc") + `(#:disallowed-references ("doc") #:configure-flags '("--enable-utf" "--enable-pcregrep-libz" "--enable-pcregrep-libbz2" @@ -62,7 +63,9 @@ "--enable-unicode-properties" "--enable-pcre16" "--enable-pcre32" - "--enable-jit") + ,@(if (target-riscv?) + '() + `("--enable-jit"))) #:phases (modify-phases %standard-phases (add-after 'install 'move-static-libs (lambda* (#:key outputs #:allow-other-keys) From patchwork Tue Aug 17 10:19:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32153 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 BBEB627BC78; Tue, 17 Aug 2021 11:27:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 9458427BC6B for ; Tue, 17 Aug 2021 11:27:15 +0100 (BST) Received: from localhost ([::1]:33302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwJO-0005ds-Lw for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:27:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwJE-0005d5-0V for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwJC-00085y-DY for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwJC-0004K9-AS for guix-patches@gnu.org; Tue, 17 Aug 2021 06:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 10/21] gnu: openssl: Fix build on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919599516581 (code B ref 50091); Tue, 17 Aug 2021 10:27:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:26:35 +0000 Received: from localhost ([127.0.0.1]:51811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwIl-0004JN-GD for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:26:35 -0400 Received: from flashner.co.il ([178.62.234.194]:45942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwIj-0004J9-Lz for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:26:33 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 0AB53402E0; Tue, 17 Aug 2021 10:26:27 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:08 +0300 Message-Id: <093c3e625f2b204f9f21cff16163edc114bb9605.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/tls.scm (openssl)[arguments]: Add phase for riscv64-linux to skip failing test. (target->openssl-target): Add case for riscv64-linux. --- gnu/packages/tls.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 4b8df04f17..f6cdeac363 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -337,7 +337,10 @@ OpenSSL for TARGET." ((string-prefix? "powerpc64" target) "linux-ppc64") ((string-prefix? "powerpc" target) - "linux-ppc"))) + "linux-ppc") + ((string-prefix? "riscv64" target) + ;; linux64-riscv64 isn't recognized until 3.0.0. + "linux-generic64"))) (define-public openssl (package @@ -380,6 +383,12 @@ OpenSSL for TARGET." #$(target->openssl-target (%current-target-system)))))) #~()) + ;; Unclear why this test is failing. + #$@(if (target-riscv?) + #~((add-after 'unpack 'skip-failing-test + (lambda _ + (delete-file "test/recipes/30-test_afalg.t")))) + #~()) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (let* ((out #$output) From patchwork Tue Aug 17 10:19:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32155 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 A553827BC6B; Tue, 17 Aug 2021 11:28:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 067AB27BC78 for ; Tue, 17 Aug 2021 11:28:13 +0100 (BST) Received: from localhost ([::1]:33750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwKK-00060Q-0T for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:28:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwKB-0005zZ-PP for guix-patches@gnu.org; Tue, 17 Aug 2021 06:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwK9-0000Qs-PU for guix-patches@gnu.org; Tue, 17 Aug 2021 06:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwK9-0004MI-M5 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 11/21] gnu: libtool: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919603516673 (code B ref 50091); Tue, 17 Aug 2021 10:28:01 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:27:15 +0000 Received: from localhost ([127.0.0.1]:51816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwJL-0004Kl-Ny for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:27:15 -0400 Received: from flashner.co.il ([178.62.234.194]:45946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwJG-0004Jt-9q for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:27:10 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 879A8402E0; Tue, 17 Aug 2021 10:27:00 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:09 +0300 Message-Id: <9aae8ef33d6bc84b2a0f3765ef56d00e0c4d3359.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/patches/libtool-skip-tests2.patch: Also skip pie tests on riscv architectures. --- gnu/packages/patches/libtool-skip-tests2.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/libtool-skip-tests2.patch b/gnu/packages/patches/libtool-skip-tests2.patch index c9d61e3b41..b0a479325f 100644 --- a/gnu/packages/patches/libtool-skip-tests2.patch +++ b/gnu/packages/patches/libtool-skip-tests2.patch @@ -1,4 +1,4 @@ -Skip the nopic test on ARM and MIPS systems. +Skip the nopic test on ARM, MIPS and RISCV systems. --- libtool-2.4.6/tests/demo.at.orig 2015-01-16 13:52:04.000000000 -0500 +++ libtool-2.4.6/tests/demo.at 2015-02-16 10:48:51.435851966 -0500 @@ -7,7 +7,7 @@ Skip the nopic test on ARM and MIPS systems. AT_CHECK([case $host in -hppa*|x86_64*|s390*) -+hppa*|x86_64*|s390*|arm*|mips*) ++hppa*|x86_64*|s390*|arm*|mips*|riscv*) # These hosts cannot use non-PIC shared libs exit 77 ;; *-solaris*|*-sunos*) @@ -18,7 +18,7 @@ Skip the nopic test on ARM and MIPS systems. { set +x $as_echo "$at_srcdir/demo.at:535: case \$host in -hppa*|x86_64*|s390*) -+hppa*|x86_64*|s390*|arm*|mips*) ++hppa*|x86_64*|s390*|arm*|mips*|riscv*) # These hosts cannot use non-PIC shared libs exit 77 ;; *-solaris*|*-sunos*) @@ -27,7 +27,7 @@ Skip the nopic test on ARM and MIPS systems. at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:535" ( $at_check_trace; case $host in -hppa*|x86_64*|s390*) -+hppa*|x86_64*|s390*|arm*|mips*) ++hppa*|x86_64*|s390*|arm*|mips*|riscv*) # These hosts cannot use non-PIC shared libs exit 77 ;; *-solaris*|*-sunos*) From patchwork Tue Aug 17 10:19:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32154 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 0463827BC82; Tue, 17 Aug 2021 11:28:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 BB77027BC78 for ; Tue, 17 Aug 2021 11:28:12 +0100 (BST) Received: from localhost ([::1]:33748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwKJ-0005zx-Qp for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwKB-0005zb-Qi for guix-patches@gnu.org; Tue, 17 Aug 2021 06:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwKA-0000Qu-Ir for guix-patches@gnu.org; Tue, 17 Aug 2021 06:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwKA-0004MX-GM for guix-patches@gnu.org; Tue, 17 Aug 2021 06:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 12/21] gnu: openblas: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919606016726 (code B ref 50091); Tue, 17 Aug 2021 10:28:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:27:40 +0000 Received: from localhost ([127.0.0.1]:51823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwJn-0004Li-Vd for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:27:40 -0400 Received: from flashner.co.il ([178.62.234.194]:45952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwJm-0004LW-Ns for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:27:39 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 0543E402E0; Tue, 17 Aug 2021 10:27:32 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:10 +0300 Message-Id: <3c3666cb80fc774655f8fb7146df0a20e82481a2.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/maths.scm (openblas)[arguments]: Adjust make-flags on riscv64-linux to target the correct architecture when building for riscv64-linux. --- gnu/packages/maths.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a7931e6eeb..7eac94f2a1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4075,6 +4075,8 @@ parts of it.") ;; Failed to detect CPU. ((string-prefix? "armhf" system) '("TARGET=ARMV7")) + ((string-prefix? "riscv64" system) + '("TARGET=RISCV64_GENERIC")) (else '())))) ;; no configure script #:phases From patchwork Tue Aug 17 10:19:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32156 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 BEAB427BC78; Tue, 17 Aug 2021 11:29:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 66DD727BC6B for ; Tue, 17 Aug 2021 11:29:09 +0100 (BST) Received: from localhost ([::1]:34386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwLE-0006TM-FZ for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:29:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwL8-0006T6-8N for guix-patches@gnu.org; Tue, 17 Aug 2021 06:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwL8-0001I1-1d for guix-patches@gnu.org; Tue, 17 Aug 2021 06:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwL7-0004OM-V6 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 13/21] gnu: mesa: Add support for riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919609716815 (code B ref 50091); Tue, 17 Aug 2021 10:29:01 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:28:17 +0000 Received: from localhost ([127.0.0.1]:51829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwKL-0004N5-7N for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:28:17 -0400 Received: from flashner.co.il ([178.62.234.194]:45960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwKJ-0004Mr-62 for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:28:11 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 7311A402E0; Tue, 17 Aug 2021 10:28:05 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:11 +0300 Message-Id: <68a51164197e64deafddd51a5cc5f1f4f31096f0.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/gl.scm (mesa)[inputs]: Add llvm-11 on riscv64-linux. [native-inputs]: Add glslang on riscv64-linux. [arguments]: In configure-flags adjust gallium-drivers to swap the power* and intel drivers for the fallback option. Specify riscv64-linux configure options for vulkan-drivers. Enable the vulkan-overlay-layer and llvm support. Adjust the custom 'disable-failing-test phase to have a riscv64-linux section. --- gnu/packages/gl.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7a8a478953..8b82352204 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -274,7 +274,8 @@ also known as DXTn or DXTC) for Mesa.") ("libxrandr" ,libxrandr) ("libxvmc" ,libxvmc) ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" "powerpc-linux") + ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" + "powerpc-linux" "riscv64-linux") ;; Note: update the 'clang' input of mesa-opencl when bumping this. `(("llvm" ,llvm-11))) (_ @@ -286,7 +287,8 @@ also known as DXTn or DXTC) for Mesa.") ("flex" ,flex) ("gettext" ,gettext-minimal) ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" "powerpc-linux") + ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" + "powerpc-linux" "riscv64-linux") `(("glslang" ,glslang))) (_ `())) @@ -301,10 +303,10 @@ also known as DXTn or DXTC) for Mesa.") ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for non-Intel architectures. '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) - ((or "powerpc64le-linux" "powerpc-linux") - '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) + ((or "x86_64-linux" "i686-linux") + '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")) (_ - '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) + '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio "-Dplatforms=x11,wayland" @@ -327,12 +329,15 @@ also known as DXTn or DXTC) for Mesa.") '("-Dvulkan-drivers=amd,swrast")) ("aarch64-linux" '("-Dvulkan-drivers=freedreno,amd,broadcom,swrast")) + ("riscv64-linux" + '("-Dvulkan-drivers=amd,swrast")) (_ '("-Dvulkan-drivers=auto"))) ;; Enable the Vulkan overlay layer on architectures using llvm. ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" "powerpc-linux") + ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" "aarch64-linux" + "powerpc-linux" "riscv64-linux") '("-Dvulkan-overlay-layer=true")) (_ '())) @@ -346,7 +351,7 @@ also known as DXTn or DXTC) for Mesa.") ((or "x86_64-linux" "i686-linux") '("-Ddri-drivers=i915,i965,nouveau,r200,r100" "-Dllvm=enabled")) ; default is x86/x86_64 only - ((or "powerpc64le-linux" "aarch64-linux" "powerpc-linux") + ((or "powerpc64le-linux" "aarch64-linux" "powerpc-linux" "riscv64-linux") '("-Ddri-drivers=nouveau,r200,r100" "-Dllvm=enabled")) (_ @@ -365,6 +370,13 @@ also known as DXTn or DXTC) for Mesa.") (add-after 'unpack 'disable-failing-test (lambda _ ,@(match (%current-system) + ("riscv64-linux" + ;; According to the test logs the llvm JIT is not designed + ;; for this architecture and the llvmpipe tests all segfault. + ;; The same is true for mesa:gallium / osmesa-render. + `((substitute* '("src/gallium/drivers/llvmpipe/meson.build" + "src/gallium/targets/osmesa/meson.build") + (("if with_tests") "if false")))) ("powerpc64le-linux" ;; Disable some of the llvmpipe tests. `((substitute* "src/gallium/drivers/llvmpipe/lp_test_arit.c" From patchwork Tue Aug 17 10:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32157 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 90FC727BC78; Tue, 17 Aug 2021 11:29:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 572D027BC6B for ; Tue, 17 Aug 2021 11:29:15 +0100 (BST) Received: from localhost ([::1]:34438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwLK-0006Vj-FK for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:29:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwL8-0006TE-NP for guix-patches@gnu.org; Tue, 17 Aug 2021 06:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwL8-0001IS-Eo for guix-patches@gnu.org; Tue, 17 Aug 2021 06:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwL8-0004OU-Bh for guix-patches@gnu.org; Tue, 17 Aug 2021 06:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 14/21] gnu: pcre2: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919612516856 (code B ref 50091); Tue, 17 Aug 2021 10:29:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:28:45 +0000 Received: from localhost ([127.0.0.1]:51832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwKq-0004No-Nn for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:28:44 -0400 Received: from flashner.co.il ([178.62.234.194]:45964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwKp-0004Nb-IO for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:28:43 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id D353F402E0; Tue, 17 Aug 2021 10:28:37 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:12 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/pcre.scm (pcre2)[arguments]: Adjust configure-flags to not build with JIT when building for riscv64-linux. --- gnu/packages/pcre.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 315dd8be1d..e63caebd64 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -108,7 +108,9 @@ POSIX regular expression API.") "--enable-pcre2test-libreadline" "--enable-pcre2-16" "--enable-pcre2-32" - "--enable-jit" + ,@(if (target-riscv?) + '() + `("--enable-jit")) "--disable-static") #:phases (modify-phases %standard-phases From patchwork Tue Aug 17 10:19:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32158 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 C02E227BC78; Tue, 17 Aug 2021 11:30:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 974D127BC6B for ; Tue, 17 Aug 2021 11:30:10 +0100 (BST) Received: from localhost ([::1]:34882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwMD-0006rD-MF for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwM6-0006qb-Sf for guix-patches@gnu.org; Tue, 17 Aug 2021 06:30:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwM6-0002A5-L6 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwM6-0004Qn-Di for guix-patches@gnu.org; Tue, 17 Aug 2021 06:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 15/21] gnu: icu4c: Skip tests on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919615816938 (code B ref 50091); Tue, 17 Aug 2021 10:30:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:29:18 +0000 Received: from localhost ([127.0.0.1]:51837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwLN-0004P8-Vg for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:29:18 -0400 Received: from flashner.co.il ([178.62.234.194]:45968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwLM-0004Ot-1L for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:29:16 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 4A4F5402E0; Tue, 17 Aug 2021 10:29:10 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:13 +0300 Message-Id: <3007ccec7f675a57dc20c18bea6c4b0ba3d0b28e.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/icu4c.scm (icu4c)[arguments]: Add phase to skip failing test on riscv64-linux. --- gnu/packages/icu4c.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 0d5f34aed8..13db71a982 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -80,6 +80,14 @@ (("LDFLAGSICUDT=-nodefaultlibs -nostdlib") "LDFLAGSICUDT=")) #t)) + ,@(if (target-riscv?) + `((add-after 'unpack 'disable-failing-test + ;; It is unknown why this test is failing. + (lambda _ + (substitute* "source/test/intltest/numbertest_api.cpp" + (("(TESTCASE_AUTO\\(unitUsage\\));" all) + (string-append "//" all)))))) + '()) (add-after 'install 'avoid-coreutils-reference ;; Don't keep a reference to the build tools. (lambda* (#:key outputs #:allow-other-keys) From patchwork Tue Aug 17 10:19:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32159 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 D821727BC78; Tue, 17 Aug 2021 11:30:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 B0FE127BC6B for ; Tue, 17 Aug 2021 11:30:12 +0100 (BST) Received: from localhost ([::1]:34940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwMF-0006tx-QD for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:30:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwM7-0006qp-Da for guix-patches@gnu.org; Tue, 17 Aug 2021 06:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwM7-0002B8-6J for guix-patches@gnu.org; Tue, 17 Aug 2021 06:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwM7-0004Qx-2o for guix-patches@gnu.org; Tue, 17 Aug 2021 06:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 16/21] gnu: openblas-ilp64: Add riscv64-linux as a supported architecture. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919619016988 (code B ref 50091); Tue, 17 Aug 2021 10:30:03 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:29:50 +0000 Received: from localhost ([127.0.0.1]:51841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwLu-0004Pw-7y for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:29:50 -0400 Received: from flashner.co.il ([178.62.234.194]:45972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwLs-0004Pj-K3 for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:29:48 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id C22F1402E0; Tue, 17 Aug 2021 10:29:42 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:14 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/maths.scm (openblas-ilp64)[supported-systems]: Add riscv64-linux. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7eac94f2a1..eb6e685278 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4104,7 +4104,7 @@ parts of it.") (define-public openblas-ilp64 (package/inherit openblas (name "openblas-ilp64") - (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) + (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux" "riscv64-linux")) (arguments (substitute-keyword-arguments (package-arguments openblas) ((#:make-flags flags '()) From patchwork Tue Aug 17 10:19:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32161 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 2010527BC78; Tue, 17 Aug 2021 11:31:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 D1B1827BC6B for ; Tue, 17 Aug 2021 11:31:35 +0100 (BST) Received: from localhost ([::1]:35460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwNa-0007II-5B for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:31:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwN6-0007Hc-6E for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwN4-00035K-3v for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwN3-0004UT-W6 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 17/21] gnu: openlibm: Remove riscv64-linux from supported systems. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919622217164 (code B ref 50091); Tue, 17 Aug 2021 10:31:01 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:30:22 +0000 Received: from localhost ([127.0.0.1]:51846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwMQ-0004Sm-Ei for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:30:22 -0400 Received: from flashner.co.il ([178.62.234.194]:45976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwMO-0004Sa-V7 for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:30:21 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 4AE01402E0; Tue, 17 Aug 2021 10:30:15 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:15 +0300 Message-Id: <6a3bdea9a60b40fde06343607ee43f879aa7a228.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/maths.scm (openlibm)[supported-systems]: Remove riscv64-linux. --- gnu/packages/maths.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index eb6e685278..06b9dfea59 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4250,7 +4250,8 @@ have a good libm for the Julia programming language that worked consistently across compilers and operating systems, and in 32-bit and 64-bit environments.") ;; Each architecture has its own make target, and there is none for mips. - (supported-systems (delete "mips64el-linux" %supported-systems)) + (supported-systems (fold delete %supported-systems + '("mips64el-linux" "riscv64-linux"))) ;; See LICENSE.md for details. (license (list license:expat license:isc From patchwork Tue Aug 17 10:19:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32160 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 0F6B727BC78; Tue, 17 Aug 2021 11:31:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 D5E1A27BC6B for ; Tue, 17 Aug 2021 11:31:34 +0100 (BST) Received: from localhost ([::1]:35458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwNZ-0007IA-UJ for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:31:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwN6-0007Ha-69 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwN4-00036D-VY for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwN4-0004Ui-Sl for guix-patches@gnu.org; Tue, 17 Aug 2021 06:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 18/21] gnu: texlive-bin: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919625517250 (code B ref 50091); Tue, 17 Aug 2021 10:31:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:30:55 +0000 Received: from localhost ([127.0.0.1]:51863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwMw-0004UA-Rj for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:30:55 -0400 Received: from flashner.co.il ([178.62.234.194]:45982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwMv-0004Tp-GH for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:30:53 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id BE872402E0; Tue, 17 Aug 2021 10:30:47 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:16 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/tex.scm (texlive-bin)[arguments]: Adjust configure-flags for riscv64-linux to skip luajit based binaries. Add phase to skip some tests. --- gnu/packages/tex.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c00c2ae177..b96aadc357 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -338,13 +338,14 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. "--with-system-teckit" "--with-system-zlib" "--with-system-zziplib" - ;; LuaJIT is not ported to powerpc64le* yet. - ,@(if (string-prefix? "powerpc64le" (or (%current-target-system) - (%current-system))) - '("--disable-luajittex" - "--disable-luajithbtex" - "--disable-mfluajit") - '())) + ;; LuaJIT is not ported to some architectures yet. + ,@(if (or (string-prefix? "powerpc64le" (or (%current-target-system) + (%current-system))) + (target-riscv?)) + '("--disable-luajittex" + "--disable-luajithbtex" + "--disable-mfluajit") + '())) ;; Disable tests on some architectures to cope with a failure of ;; luajiterr.test. @@ -385,7 +386,8 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. (("^\\./omfonts -ofm2opl \\$srcdir/tests/check tests/xcheck \\|\\| exit 1") "./omfonts -ofm2opl $srcdir/tests/check tests/xcheck || exit 77")) #t)) - ,@(if (target-ppc32?) + ,@(if (or (target-ppc32?) + (target-riscv?)) ;; Some mendex tests fail on some architectures. `((add-after 'unpack 'skip-mendex-tests (lambda _ From patchwork Tue Aug 17 10:19:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32162 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 3612B27BC78; Tue, 17 Aug 2021 11:32:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 0B93427BC6B for ; Tue, 17 Aug 2021 11:32:17 +0100 (BST) Received: from localhost ([::1]:36180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwOG-0007uv-3j for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwO2-0007uM-P7 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40330) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwO2-00044f-He for guix-patches@gnu.org; Tue, 17 Aug 2021 06:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwO2-0004Wk-Cj for guix-patches@gnu.org; Tue, 17 Aug 2021 06:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 19/21] gnu: texlive-updmap.cfg: Update hash. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919628717336 (code B ref 50091); Tue, 17 Aug 2021 10:32:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:31:27 +0000 Received: from localhost ([127.0.0.1]:51870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwNT-0004VX-3h for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:31:27 -0400 Received: from flashner.co.il ([178.62.234.194]:45986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwNS-0004VI-2U for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:31:26 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 3F0FB402E0; Tue, 17 Aug 2021 10:31:20 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:17 +0300 Message-Id: <0375a2004b6ab1b898f5cf87baf63a5922178419.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 hash seems to have changed. * gnu/packages/tex.scm (texlive-updmap.cfg)[source]: Update hash. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b96aadc357..072793ec30 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4077,7 +4077,7 @@ configuration of a base set of packages plus PACKAGES." (file-name "updmap.cfg") (sha256 (base32 - "1q3l7yx5sng080ibfb8z3rdah0hhq170j6xw8z1w8i4w9m37lp94")))) + "0zhpyld702im6352fwp41f2hgfkpj2b4j1kfsjqbkijlcmvb6w2c")))) (name "texlive-updmap.cfg") (build-system copy-build-system) (arguments From patchwork Tue Aug 17 10:19:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32163 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 F2A1C27BC78; Tue, 17 Aug 2021 11:32:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 B779C27BC6B for ; Tue, 17 Aug 2021 11:32:17 +0100 (BST) Received: from localhost ([::1]:36204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwOG-0007w2-QY for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwO3-0007uN-2P for guix-patches@gnu.org; Tue, 17 Aug 2021 06:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40331) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwO2-00044x-RX for guix-patches@gnu.org; Tue, 17 Aug 2021 06:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwO2-0004Ws-P7 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 20/21] gnu: lz4: Build on riscv64-linux without valgrind. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919631917394 (code B ref 50091); Tue, 17 Aug 2021 10:32:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:31:59 +0000 Received: from localhost ([127.0.0.1]:51876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwNz-0004WU-AR for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:31:59 -0400 Received: from flashner.co.il ([178.62.234.194]:45990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwNy-0004WG-CR for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:31:58 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id A408F402E0; Tue, 17 Aug 2021 10:31:52 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:18 +0300 Message-Id: <996a1fa4122eb34a09371956c0724728bd8a4145.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/compression.scm (lz4)[native-inputs]: Don't use valgrind when building for riscv64-linux. --- gnu/packages/compression.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 93d517abd5..1803237e6e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -819,7 +819,9 @@ decompression of some loosely related file formats used by Microsoft.") (native-inputs `(;; For tests. ("python" ,python) - ("valgrind" ,valgrind))) + ,@(if (target-riscv?) + '() + `(("valgrind" ,valgrind))))) (arguments `(;; Not designed for parallel testing. ;; See https://github.com/lz4/lz4/issues/957#issuecomment-737419821 From patchwork Tue Aug 17 10:19:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32164 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 1200127BC78; Tue, 17 Aug 2021 11:33:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 DF94227BC6B for ; Tue, 17 Aug 2021 11:33:14 +0100 (BST) Received: from localhost ([::1]:36674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwPB-0008It-Vl for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:33:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwP0-0008Ic-Pm for guix-patches@gnu.org; Tue, 17 Aug 2021 06:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwP0-0004v2-J5 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwP0-0004Yt-G1 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 21/21] gnu: lapack: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919635217479 (code B ref 50091); Tue, 17 Aug 2021 10:33:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:32:32 +0000 Received: from localhost ([127.0.0.1]:51883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwOW-0004Xr-Id for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:32:32 -0400 Received: from flashner.co.il ([178.62.234.194]:45994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwOU-0004Xb-TL for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:32:31 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 28B97402E0; Tue, 17 Aug 2021 10:32:25 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:19 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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/maths.scm (lapack)[inputs]: When building for riscv64-linux explicitly add gfortran:lib. --- gnu/packages/maths.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 06b9dfea59..f9b3a20274 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -889,6 +889,9 @@ large scale eigenvalue problems.") (build-system cmake-build-system) (home-page "http://www.netlib.org/lapack/") (inputs `(("fortran" ,gfortran) + ,@(if (target-riscv?) + `(("fortran:lib" ,gfortran "lib")) + '()) ("python" ,python-wrapper))) (arguments `(#:configure-flags (list