Received: (at 69944) by debbugs.gnu.org; 21 Apr 2024 14:03:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 21 10:03:58 2024 Received: from localhost ([127.0.0.1]:43137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ryXnS-0006fL-It for submit <at> debbugs.gnu.org; Sun, 21 Apr 2024 10:03:58 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1ryXnP-0006en-SB for 69944 <at> debbugs.gnu.org; Sun, 21 Apr 2024 10:03:57 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 67E6127BBE2; Sun, 21 Apr 2024 15:03:39 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b3cc160f; Sun, 21 Apr 2024 14:03:38 +0000 (UTC) From: Christopher Baines <mail@HIDDEN> To: Zheng Junjie <zhengjunjie@HIDDEN> Subject: Re: [bug#69944] [PATCH] gnu: dmraid: Fix cross-compiling to riscv64-linux. In-Reply-To: <87a5mjg57z.fsf@HIDDEN> (Zheng Junjie's message of "Wed, 27 Mar 2024 21:40:02 +0800") References: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> <875xx7hmhm.fsf@HIDDEN> <87a5mjg57z.fsf@HIDDEN> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Sun, 21 Apr 2024 15:03:36 +0100 Message-ID: <87zftm24p3.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69944 Cc: 69944 <at> debbugs.gnu.org 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: -1.0 (-) --=-=-= Content-Type: text/plain Zheng Junjie <zhengjunjie@HIDDEN> writes: > Christopher Baines <mail@HIDDEN> writes: > >> [[PGP Signed Part:Undecided]] >> >> Zheng Junjie <zhengjunjie@HIDDEN> writes: >> >>> * gnu/packages/disk.scm (dmraid) >>> [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. >>> [arguments]: When target riscv64-linux-gnu, add update-config phase. >>> >>> Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb >>> --- >>> gnu/packages/disk.scm | 22 +++++++++++++++++++--- >>> 1 file changed, 19 insertions(+), 3 deletions(-) >> >> Hi! >> >> Thanks for the patch, this doesn't build for me though: > > Sorry, this patch should build, and also build to aarch64-linux-gnu. Thanks, would you be able to rebase this on master and resend, as I don't think it applies currently? Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYlHLhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xce5hAAmeZrj5nGvjLOV/xReGaNQFFwSV8xWB7v RVUWXnagpQLDBuevg8s2Jc8vMuOSUyADWGQYcBfjRLsQJh5hh2liwzfgX8x1bvOV SfiCCIymH+NTspO2geSn9lTUStQZr9WIvQTMJ+flvUzDb/ZcPe4twsIzqVdH433p lrBGFQV/6v7OX5xb3vUpqupKbTLCD5GLXcqKu9p0ZM0jnvTUGK6kDlRc6WYijc1b zQl8rdlcK2H3qq4RIxjD6LKKMzTDa9EdSOH5XAwq4aBpTbaphBJ+6R99Gf5KIixB U7qNUVca63OKadgxO7P/MSVIW12CiIyfQwWEbl5YQte6ByKGtY2cYuj0CmiBuLkA X1hzCtKi37rwe2aueG5PVodw3Qvg92ImxlBKHmlWB11w7b162HWoUyvrJxFEdEXG Kr0rtnJwoUktlYqn+8cGWjXmSqNF4cyfmSG+uyI5XRIdcCWLRcCYny7q0aG1A98T dmcHaU3N6QMGZ4xjMteSBei1ErOy2sTAYnOghC7s4Uj576QMiLsx4Kc0wLPaXj/m zM/SS+S6+8gQNqNNPot+CAUFkebX5XIjUHr1IGa6X8qSNFYTMw3C2/I8KK0dfzOX 5G0X9PTpv5TKAYrxGCvn7m97A9bFEcFUKxXseZTwXXVg86p1F3fxOGLVKSP6X5qP yjQRbOEXuFA= =aTzT -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN
:bug#69944
; Package guix-patches
.
Full text available.Received: (at 69944) by debbugs.gnu.org; 27 Mar 2024 13:44:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 27 09:44:10 2024 Received: from localhost ([127.0.0.1]:36157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rpTZZ-0005WD-MR for submit <at> debbugs.gnu.org; Wed, 27 Mar 2024 09:44:10 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:41644 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zhengjunjie@HIDDEN>) id 1rpTZU-0005T2-6a for 69944 <at> debbugs.gnu.org; Wed, 27 Mar 2024 09:44:08 -0400 Received: from m (unknown [107.174.64.25]) by APP-01 (Coremail) with SMTP id qwCowABHT5+SIgRmYLpWCQ--.48487S2; Wed, 27 Mar 2024 21:43:51 +0800 (CST) References: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> <875xx7hmhm.fsf@HIDDEN> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Zheng Junjie <zhengjunjie@HIDDEN> To: Christopher Baines <mail@HIDDEN> Subject: Re: [bug#69944] [PATCH] gnu: dmraid: Fix cross-compiling to riscv64-linux. Date: Wed, 27 Mar 2024 21:40:02 +0800 In-reply-to: <875xx7hmhm.fsf@HIDDEN> Message-ID: <87a5mjg57z.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: qwCowABHT5+SIgRmYLpWCQ--.48487S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Gr1ftF1xAw4kZF4kAryxXwb_yoWxArg_Ca 45ZasrGr1kXFZ3Ca4vqFWDCryUZayjqF4F93WIqrWrJrZIvr42q3ZYqrsxA3Z8KF45Ar1x Cr4kZry8Ar9FvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbskYjsxI4VWkCwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_GcCE3s1lnx0Ee4C267I2x7xF54xIwI0E7I0Y6sxI4wAS0I0E0xvY zxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ew Av7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY 6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r 4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF 67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2I x0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2 z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73Uj IFyTuYvjxUY-B_UUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69944 Cc: 69944 <at> debbugs.gnu.org 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: -3.3 (---) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Christopher Baines <mail@HIDDEN> writes: > [[PGP Signed Part:Undecided]] > > Zheng Junjie <zhengjunjie@HIDDEN> writes: > >> * gnu/packages/disk.scm (dmraid) >> [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. >> [arguments]: When target riscv64-linux-gnu, add update-config phase. >> >> Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb >> --- >> gnu/packages/disk.scm | 22 +++++++++++++++++++--- >> 1 file changed, 19 insertions(+), 3 deletions(-) > > Hi! > > Thanks for the patch, this doesn't build for me though: Sorry, this patch should build, and also build to aarch64-linux-gnu. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-dmraid-Fix-cross-compiling.patch Content-Transfer-Encoding: quoted-printable From=2061f56da975095071649e48a6e975ffcdd4dd8063 Mon Sep 17 00:00:00 2001 Message-ID: <61f56da975095071649e48a6e975ffcdd4dd8063.1711546964.git.zhengj= unjie@HIDDEN> From: Zheng Junjie <zhengjunjie@HIDDEN> Date: Sat, 23 Mar 2024 00:17:47 +0800 Subject: [PATCH] gnu: dmraid: Fix cross-compiling * gnu/packages/disk.scm (dmraid) [native-inputs]: When cross compiling, add config, autoconf, automake. [arguments]: When cross compiling, add update-config and fix-rpl_malloc pha= se. Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb =2D-- gnu/packages/disk.scm | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b0117d77ce..35e75d89fe 100644 =2D-- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -27,7 +27,7 @@ ;;; Copyright =C2=A9 2022 Disseminate Dissent <disseminatedissent@protonma= il.com> ;;; Copyright =C2=A9 2023 Timotej Lazar <timotej.lazar@HIDDEN> ;;; Copyright =C2=A9 2023 Morgan Smith <Morgan.J.Smith@HIDDEN> =2D;;; Copyright =C2=A9 2023 Zheng Junjie <873216071@HIDDEN> +;;; Copyright =C2=A9 2023, 2024 Zheng Junjie <873216071@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1145,7 +1145,13 @@ (define-public dmraid "1n7vsqvh7y6yvil682q129d21yhb0cmvd5fvsbkza7ypd78inhlk")))) (build-system gnu-build-system) (inputs (list lvm2)) =2D (native-inputs (list which)) + (native-inputs + (append (if (%current-target-system) + (list config + autoconf + automake) + '()) + (list which))) (arguments `(#:tests? #f ; No tests. ;; Prevent a race condition where some target would attempt to link @@ -1158,7 +1164,34 @@ (define-public dmraid (chdir (string-append ,version "/dmraid")) (substitute* "make.tmpl.in" (("/bin/sh") (which "sh"))) =2D #t))) + #t)) + ,@(if (%current-target-system) + `((add-after 'unpack 'update-config + (lambda* (#:key native-inputs inputs + #:allow-other-keys) + (with-directory-excursion + (string-append ,version "/dmraid/autocon= f") + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) + ".")) + '("config.guess" "config.sub")))= )) + (add-after 'unpack 'fix-rpl_malloc + (lambda _ + ;; AC_FUNC_MALLOC and AC_FUNC_REALLOC usually + ;; unneeded, see + ;; https://lists.gnu.org/archive/html/autoco= nf/2003-02/msg00017.html + (with-directory-excursion + (string-append ,version "/dmraid") + (substitute* "configure.in" + (("AC_FUNC_MALLOC") "") + (("AC_FUNC_REALLOC") "")) + (delete-file "./configure") + (copy-file "configure.in" "configure.ac") + (invoke "autoreconf" "-fiv"))))) + '())) #:configure-flags (list ;; Make sure programs such as 'dmevent_tool= ' can ;; find libdmraid.so. (string-append "LDFLAGS=3D-Wl,-rpath=3D" base-commit: 656baadf83f2812c0ff79f4f2f0b5f1e927ed8a5 =2D-=20 2.41.0 --=-=-= Content-Type: text/plain > > checking build system type... x86_64-unknown-linux-gnu > checking host system type... Invalid configuration > `riscv64-linux-gnu': machine `riscv64' not recognized > configure: error: > /gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash > autoconf/config.sub riscv64-linux-gnu failed > error: in phase 'configure': uncaught exception: > %exception #<&invoke-error program: > "/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" > arguments: ("./configure" "CC_FOR_BUILD=gcc" > "CONFIG_SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" > "SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" > "--prefix=/gnu/store/gb6ij94hk33ivx193zq87m2vhlhzsm8j-dmraid-1.0.0.rc16-3" > "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" > "--host=riscv64-linux-gnu" > "LDFLAGS=-Wl,-rpath=/gnu/store/gb6ij94hk33ivx193zq87m2vhlhzsm8j-dmraid-1.0.0.rc16-3/lib") > exit-status: 1 term-signal: #f stop-signal: #f> > > > https://bordeaux.guix.gnu.org/build/47b7e0bf-b082-4d62-ac4c-8de5c28f5faf/log > > [[End of PGP Signed Part]] --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYEIpAACgkQO1qpk+Gi 3/DK2hAApHj53TD81WpDK/Otbkx9lUSoOf1rKh2B4bv1Ji0xNpz5qnVaihb8Nj3s T9M74dxjAFA0WA/9+p6N/JaxykhNaVwNBLZeX18GbVJtG0huaGlIBZf3RDkNhCLf 1xf3YBdYaBr8jVpeWfk9KD7I0h3nO6IgGfj6mvde497q1d/qYzkx9+nGXu5kdlux liwSk4CpYNbJQhBVuv5cJBCrd9uBtSbSV0ZIK8sOyrShdD/BtpGltTH4ItpQmXoE E5nsW9ucECFdeLirAW4CXSmEPafxaPBRszq5FD9vvPqNielp5uTcC4nHCorTtIr3 rASgsCYIg5GN+WUKx3pcP80yXq+NON+zQnF7OcZNPyXCMWHXbhlouzlzl0LSrcMB rnSig/YlKiQ6zt6FfduLO/JNWnLqiDQiurRCWKCo1zoS693WlqrHT9xP6msg344F DqENkDsVrNvkqBaTI9+Rd8OVwd3rWGl9k6AzJApZ9CCAvqNAzRJ3Mca/Z2ISM94r DLVKvsFaHYUjv47nVHQKpAqeg8NKwtG/qGTCEcfN1J9e3YSMGfQgLhRkw1I39hWQ L94imUHVb23kdjXPpTGtyvLOWGJMBqw91mGJF4g5Y9aVI1wfTZ7r+SeAPNA/SqTT X7/t2bl1+oGiWFWn1KFk9jAjxy3IHED7Wvaf9HzOYhvUvKDQCBI= =TZUc -----END PGP SIGNATURE----- --==-=-=--
guix-patches@HIDDEN
:bug#69944
; Package guix-patches
.
Full text available.Received: (at 69944) by debbugs.gnu.org; 27 Mar 2024 12:45:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 27 08:45:32 2024 Received: from localhost ([127.0.0.1]:36015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rpSeq-0002fP-AS for submit <at> debbugs.gnu.org; Wed, 27 Mar 2024 08:45:32 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1rpSel-0002fC-Tj for 69944 <at> debbugs.gnu.org; Wed, 27 Mar 2024 08:45:31 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id BA80D27BBE2; Wed, 27 Mar 2024 12:45:26 +0000 (GMT) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 88a0daca; Wed, 27 Mar 2024 12:45:26 +0000 (UTC) References: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> User-agent: mu4e 1.10.8; emacs 29.1 From: Christopher Baines <mail@HIDDEN> To: Zheng Junjie <zhengjunjie@HIDDEN> Subject: Re: [bug#69944] [PATCH] gnu: dmraid: Fix cross-compiling to riscv64-linux. Date: Wed, 27 Mar 2024 12:44:33 +0000 In-reply-to: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> Message-ID: <875xx7hmhm.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69944 Cc: guix-patches@HIDDEN, 69944 <at> debbugs.gnu.org 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: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Zheng Junjie <zhengjunjie@HIDDEN> writes: > * gnu/packages/disk.scm (dmraid) > [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. > [arguments]: When target riscv64-linux-gnu, add update-config phase. > > Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb > --- > gnu/packages/disk.scm | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) Hi! Thanks for the patch, this doesn't build for me though: checking build system type... x86_64-unknown-linux-gnu checking host system type... Invalid configuration `riscv64-linux-gnu': mac= hine `riscv64' not recognized configure: error: /gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-= 5.1.16/bin/bash autoconf/config.sub riscv64-linux-gnu failed error: in phase 'configure': uncaught exception: %exception #<&invoke-error program: "/gnu/store/rib9g2ig1xf3kclyl076w28parm= ncg4k-bash-minimal-5.1.16/bin/bash" arguments: ("./configure" "CC_FOR_BUILD= =3Dgcc" "CONFIG_SHELL=3D/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-mi= nimal-5.1.16/bin/bash" "SHELL=3D/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k= -bash-minimal-5.1.16/bin/bash" "--prefix=3D/gnu/store/gb6ij94hk33ivx193zq87= m2vhlhzsm8j-dmraid-1.0.0.rc16-3" "--enable-fast-install" "--build=3Dx86_64-= unknown-linux-gnu" "--host=3Driscv64-linux-gnu" "LDFLAGS=3D-Wl,-rpath=3D/gn= u/store/gb6ij94hk33ivx193zq87m2vhlhzsm8j-dmraid-1.0.0.rc16-3/lib") exit-sta= tus: 1 term-signal: #f stop-signal: #f>=20 https://bordeaux.guix.gnu.org/build/47b7e0bf-b082-4d62-ac4c-8de5c28f5faf/log --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYEFOVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xd7XBAAgpeU+HZ53CmpBrW/VTi+QWMG1wAz7y7e l/QNu0Eqq3Guj4FtiPrwceaH2ulAhHYfnM414zcZUiZ2ZFmPVq4fK0PTH3T4NhRr qFUREoml5cDrym9nW1VrQBgWQ4mcIpyNN+a+Hx3ceSIrEOYAVAMgfkj1ZTmKHtQY 2Zk0X1AiZZ4bnlQtVAgOE5bpQN1sBEgFLxSI++Uu2HJa+3SpHkXDBBTmuwZvPlQ1 2P8PipgaJ7i+iVfyAsbeQU16DENLC9CUkt50w+d7yILAJeZRUldjHZPeK6Yc4pEr 7xbrIsrTTXvFMhFmU+wNBfFPwbp3namoporB/efMyg+/JiIjhhlL3ck8m2deNcsy AKAdzCNSRG+65/UYyDAMwWczdlUPIP2Uzp5zwTur77HPvJsbigwsy/A1GydAM8Se xzGQHIqMOAOVgMSKLsCRbrK10jJqWiGqn098QYuFX8NLNp2/AlkromVPg7GGi8M7 +9mu1DXZ0I8kZG2OVh5J8pnCJ++kDJ+JJVyKZ2gq/uVsnb7i0nx5iAMRbxVYOCK8 zLH1jpycL8Jl2cQWzRtLEW1YMzz3pnjwcSUJbk6TivFE8x8AnUtIbAPHC0+rL3Ke dXNWIzOQAuOOh7i4j2eXvDUdjBbHMXc/4PuLTn484dhT0LiXRaFqkkAB+HN8Ob92 3IFlte4z6Rs= =YSmq -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN
:bug#69944
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 27 Mar 2024 12:45:41 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 27 08:45:41 2024 Received: from localhost ([127.0.0.1]:36018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rpSey-0002fl-MN for submit <at> debbugs.gnu.org; Wed, 27 Mar 2024 08:45:41 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1rpSew-0002fX-SY for submit <at> debbugs.gnu.org; Wed, 27 Mar 2024 08:45:39 -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 <mail@HIDDEN>) id 1rpSep-0005QL-Nb for guix-patches@HIDDEN; Wed, 27 Mar 2024 08:45:31 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from <mail@HIDDEN>) id 1rpSen-0003de-RP for guix-patches@HIDDEN; Wed, 27 Mar 2024 08:45:31 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id BA80D27BBE2; Wed, 27 Mar 2024 12:45:26 +0000 (GMT) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 88a0daca; Wed, 27 Mar 2024 12:45:26 +0000 (UTC) References: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> User-agent: mu4e 1.10.8; emacs 29.1 From: Christopher Baines <mail@HIDDEN> To: Zheng Junjie <zhengjunjie@HIDDEN> Subject: Re: [bug#69944] [PATCH] gnu: dmraid: Fix cross-compiling to riscv64-linux. Date: Wed, 27 Mar 2024 12:44:33 +0000 In-reply-to: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> Message-ID: <875xx7hmhm.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@HIDDEN; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: guix-patches@HIDDEN, 69944 <at> debbugs.gnu.org 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: -0.1 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Zheng Junjie <zhengjunjie@HIDDEN> writes: > * gnu/packages/disk.scm (dmraid) > [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. > [arguments]: When target riscv64-linux-gnu, add update-config phase. > > Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb > --- > gnu/packages/disk.scm | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) Hi! Thanks for the patch, this doesn't build for me though: checking build system type... x86_64-unknown-linux-gnu checking host system type... Invalid configuration `riscv64-linux-gnu': mac= hine `riscv64' not recognized configure: error: /gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-= 5.1.16/bin/bash autoconf/config.sub riscv64-linux-gnu failed error: in phase 'configure': uncaught exception: %exception #<&invoke-error program: "/gnu/store/rib9g2ig1xf3kclyl076w28parm= ncg4k-bash-minimal-5.1.16/bin/bash" arguments: ("./configure" "CC_FOR_BUILD= =3Dgcc" "CONFIG_SHELL=3D/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-mi= nimal-5.1.16/bin/bash" "SHELL=3D/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k= -bash-minimal-5.1.16/bin/bash" "--prefix=3D/gnu/store/gb6ij94hk33ivx193zq87= m2vhlhzsm8j-dmraid-1.0.0.rc16-3" "--enable-fast-install" "--build=3Dx86_64-= unknown-linux-gnu" "--host=3Driscv64-linux-gnu" "LDFLAGS=3D-Wl,-rpath=3D/gn= u/store/gb6ij94hk33ivx193zq87m2vhlhzsm8j-dmraid-1.0.0.rc16-3/lib") exit-sta= tus: 1 term-signal: #f stop-signal: #f>=20 https://bordeaux.guix.gnu.org/build/47b7e0bf-b082-4d62-ac4c-8de5c28f5faf/log --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYEFOVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xd7XBAAgpeU+HZ53CmpBrW/VTi+QWMG1wAz7y7e l/QNu0Eqq3Guj4FtiPrwceaH2ulAhHYfnM414zcZUiZ2ZFmPVq4fK0PTH3T4NhRr qFUREoml5cDrym9nW1VrQBgWQ4mcIpyNN+a+Hx3ceSIrEOYAVAMgfkj1ZTmKHtQY 2Zk0X1AiZZ4bnlQtVAgOE5bpQN1sBEgFLxSI++Uu2HJa+3SpHkXDBBTmuwZvPlQ1 2P8PipgaJ7i+iVfyAsbeQU16DENLC9CUkt50w+d7yILAJeZRUldjHZPeK6Yc4pEr 7xbrIsrTTXvFMhFmU+wNBfFPwbp3namoporB/efMyg+/JiIjhhlL3ck8m2deNcsy AKAdzCNSRG+65/UYyDAMwWczdlUPIP2Uzp5zwTur77HPvJsbigwsy/A1GydAM8Se xzGQHIqMOAOVgMSKLsCRbrK10jJqWiGqn098QYuFX8NLNp2/AlkromVPg7GGi8M7 +9mu1DXZ0I8kZG2OVh5J8pnCJ++kDJ+JJVyKZ2gq/uVsnb7i0nx5iAMRbxVYOCK8 zLH1jpycL8Jl2cQWzRtLEW1YMzz3pnjwcSUJbk6TivFE8x8AnUtIbAPHC0+rL3Ke dXNWIzOQAuOOh7i4j2eXvDUdjBbHMXc/4PuLTn484dhT0LiXRaFqkkAB+HN8Ob92 3IFlte4z6Rs= =YSmq -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN
:bug#69944
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 22 Mar 2024 17:15:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 22 13:15:37 2024 Received: from localhost ([127.0.0.1]:36575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rniUS-0001r1-T8 for submit <at> debbugs.gnu.org; Fri, 22 Mar 2024 13:15:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:59478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zhengjunjie@HIDDEN>) id 1rniUR-0001qk-1J for submit <at> debbugs.gnu.org; Fri, 22 Mar 2024 13:15:36 -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 <zhengjunjie@HIDDEN>) id 1rni0m-0000zq-PR for guix-patches@HIDDEN; Fri, 22 Mar 2024 12:44:57 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>) id 1rni0j-0006Jm-SX for guix-patches@HIDDEN; Fri, 22 Mar 2024 12:44:55 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-03 (Coremail) with SMTP id rQCowABHTuZ_tf1l0X7RBw--.21016S2; Sat, 23 Mar 2024 00:44:48 +0800 (CST) From: Zheng Junjie <zhengjunjie@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: dmraid: Fix cross-compiling to riscv64-linux. Date: Sat, 23 Mar 2024 00:44:44 +0800 Message-ID: <a1e35066bfa43894fe6ab607cdc258866ed8896d.1711125878.git.zhengjunjie@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowABHTuZ_tf1l0X7RBw--.21016S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@HIDDEN; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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.4 (--) * gnu/packages/disk.scm (dmraid) [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. [arguments]: When target riscv64-linux-gnu, add update-config phase. Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb --- gnu/packages/disk.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b0117d77ce..5339f54d99 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@HIDDEN> ;;; Copyright © 2023 Timotej Lazar <timotej.lazar@HIDDEN> ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith@HIDDEN> -;;; Copyright © 2023 Zheng Junjie <873216071@HIDDEN> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1145,7 +1145,12 @@ (define-public dmraid "1n7vsqvh7y6yvil682q129d21yhb0cmvd5fvsbkza7ypd78inhlk")))) (build-system gnu-build-system) (inputs (list lvm2)) - (native-inputs (list which)) + (native-inputs + (append (if (and (target-riscv64?) + (%current-target-system)) + (list config) + '()) + (list which))) (arguments `(#:tests? #f ; No tests. ;; Prevent a race condition where some target would attempt to link @@ -1158,7 +1163,18 @@ (define-public dmraid (chdir (string-append ,version "/dmraid")) (substitute* "make.tmpl.in" (("/bin/sh") (which "sh"))) - #t))) + #t)) + ,@(if (and (target-riscv64?) + (%current-target-system)) + `((add-after 'unpack 'update-config + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub"))))) + '())) #:configure-flags (list ;; Make sure programs such as 'dmevent_tool' can ;; find libdmraid.so. (string-append "LDFLAGS=-Wl,-rpath=" base-commit: 40f53e8fb5b867e3a1e8fa798328423718282aac -- 2.41.0
Zheng Junjie <zhengjunjie@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#69944
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.