GNU bug report logs - #63839
[PATCH] gnu: riscv-pk: don't target riscv64-linux-gnu when current system is riscv64.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 2 Jun 2023 12:10:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 02 08:10:52 2023
Received: from localhost ([127.0.0.1]:39241 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1q53cK-00025b-0i
	for submit <at> debbugs.gnu.org; Fri, 02 Jun 2023 08:10:52 -0400
Received: from lists.gnu.org ([209.51.188.17]:37248)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <873216071@HIDDEN>) id 1q53cG-00025Q-92
 for submit <at> debbugs.gnu.org; Fri, 02 Jun 2023 08:10:50 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <873216071@HIDDEN>) id 1q53cG-0003iW-2l
 for guix-patches@HIDDEN; Fri, 02 Jun 2023 08:10:48 -0400
Received: from out203-205-251-59.mail.qq.com ([203.205.251.59])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <873216071@HIDDEN>) id 1q53c8-0004SD-41
 for guix-patches@HIDDEN; Fri, 02 Jun 2023 08:10:47 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512;
 t=1685707829; bh=9lNkoxn6yJmU31MFbmvuu6fAWtJ9a3XRWFd9XeVKhU0=;
 h=From:To:Subject:Date;
 b=BejQ8sxwx9+NWG9M9156eLHD9itvZuUrfEp3DNFKbi8dPEqjOTELVfvMT+aOKoBrB
 UWk23d9jNJ1PMS28tzOu4yxb6y2BoKcfafv+jhKe1KSgUY4BFvBoiKHx/u6GPF31gz
 Gq7TmyYMvRLiOtluqaz1/XmpHO6lDlhscudltQPU=
Received: from localhost.localdomain ([111.0.51.197])
 by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP
 id 28A376FA; Fri, 02 Jun 2023 20:10:10 +0800
X-QQ-mid: xmsmtpt1685707810tyciknfey
Message-ID: <tencent_D0FFDA97CD8454B0ACE9BF6F9DB7F29E1207@HIDDEN>
X-QQ-XMAILINFO: N7h1OCCDntujEsnnP6Oe5+qSYrHeevDcdgOcQ5oQw/exPcZFJrpOemjZ9d6iDw
 FcdgHiFWuW9+a//06bvrC6Z3ZzoF2hvzO7sPMPso52UOEkw8V9wb3ipBAhb4ajvGZ8/9s/vzlQWv
 c8pibAqUSAr/4anWAA5+BDEOuXL+OUQyhGC1hma73/8ZYgJ+RNmMUiD44ZKFtn4xV4u89itSfBro
 gOVeHG2sYclqzZyHd7cvNveeyTF/+FfWXq3K8VEAs6WqrY6lU8m8MFPSoXZg0vwkEPQcmT2WmDEB
 7enxHSEvCa+FFbq/i1Q4zDx8AUL+vZxVmrBNE6rC5164idArTioB172/DbWNQ/ZagIX90t2VESpX
 oe1h5MstBo2zcg0KJpb4CIOJrsTrnmojv6uc4HPnTS3qXAgBhK1LMWA/1CHzNVjUw3eNH5eioh/I
 xmfmVkwh6St6/uK5KIoyzcVCMn3hR4vGj46ZZIIZsREf8rZrlxBSHqFvJ+ka7IJ2NcjZqAnH2zVt
 uMiYGmAU7kiC3Ai3/zD8i0dHaX4rC1cH+7ATPYDl+Hz7IsebAhH0fhpN5znIMB3O74h0C89TrHgz
 N5rfj6zp2Wy2DQmdn8q55mNZHn9RR26SoOJMp0LRkX78apqsXQUWaSfKzcv+4yj4hI/2xRiPfP4+
 ra0xHpKedbOiuN0shDUBTNFNCqmT+ctEHFAOqtWKyKHAFeqIqfnPUsfBswXlH9t2DNsgbFJqmokF
 UYN4Rn0LztD8GKOSiky7aQWK09YFmSAt6QvkjDQRQoLeFLiL1I/cfE9xxHgOvqkv+nhL02SL84cZ
 1QXkujz+e1x2uu6Ff2LU/0guEvhftJruRsvHiK5CrAG5euwPa0Ag7gP3BJ9z6lUW1j5xK5AdOEc/
 TWkODJzKC4RycWKi4RylUGGZg8PPebT0gc55BXT2/lC0OsaZXErE41RyYf2zXWax/UODGMvOAGQI
 3aKfyrbB7t7PweacATlQ==
From: Z572 <873216071@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: riscv-pk: don't target riscv64-linux-gnu when current
 system is riscv64.
Date: Fri,  2 Jun 2023 20:10:09 +0800
X-OQ-MSGID: <d6316b622ac68f0c3b572ea014dfb21b5b6f3073.1685707802.git.873216071@HIDDEN>
X-Mailer: git-send-email 2.40.1
MIME-Version: 1.0
Content-Type: text/plain; charset=y
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=203.205.251.59; envelope-from=873216071@HIDDEN;
 helo=out203-205-251-59.mail.qq.com
X-Spam_score_int: 11
X-Spam_score: 1.1
X-Spam_bar: +
X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
 DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25,
 FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001,
 RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01,
 T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.1 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)

* gnu/packages/virtualization.scm (riscv-pk): don't target riscv64-linux-gnu
when current system is riscv64.
---
 gnu/packages/virtualization.scm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index c88fd31146..1257bb531d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@HIDDEN>
 ;;; Copyright © 2022 Arun Isaac <arunisaac@HIDDEN>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@HIDDEN>
+;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2554,16 +2555,21 @@ (define-public riscv-pk
          "1cc0rz4q3a1zw8756b8yysw8lb5g4xbjajh5lvqbjix41hbdx6xz"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:out-of-source? #t
-           ;; riscv-pk can only be built for riscv64.
-           #:target "riscv64-linux-gnu"
-           #:make-flags #~(list (string-append "INSTALLDIR=" #$output))
-           ;; Add flags to keep symbols fromhost and tohost. These symbols are
-           ;; required for the correct functioning of pk.
-           #:strip-flags #~(list "--strip-unneeded"
-                                 "--keep-symbol=fromhost"
-                                 "--keep-symbol=tohost"
-                                 "--enable-deterministic-archives")))
+     (append
+      ;; riscv-pk can only be built for riscv64.
+      (if (string-prefix? "riscv64" (%current-system))
+          '()
+          (list
+           #:target "riscv64-linux-gnu"))
+      (list #:out-of-source? #t
+
+            #:make-flags #~(list (string-append "INSTALLDIR=" #$output))
+            ;; Add flags to keep symbols fromhost and tohost. These symbols are
+            ;; required for the correct functioning of pk.
+            #:strip-flags #~(list "--strip-unneeded"
+                                  "--keep-symbol=fromhost"
+                                  "--keep-symbol=tohost"
+                                  "--enable-deterministic-archives"))))
     (home-page "https://github.com/riscv-software-src/riscv-pk")
     (synopsis "RISC-V Proxy Kernel")
     (description "The RISC-V Proxy Kernel, @command{pk}, is a lightweight

base-commit: 75bdd4b05253c0e6ca5399f60e424f0f00fdb673
-- 
2.40.1