From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:00:21 2024 Received: (at submit) by debbugs.gnu.org; 16 May 2024 15:00:21 +0000 Received: from localhost ([127.0.0.1]:49169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7caf-0007fb-3S for submit@debbugs.gnu.org; Thu, 16 May 2024 11:00:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:55926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7caZ-0007fT-9l for submit@debbugs.gnu.org; Thu, 16 May 2024 11:00:16 -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 ) id 1s7caV-0000BX-Tu for guix-patches@gnu.org; Thu, 16 May 2024 11:00:08 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7caT-0007KF-61 for guix-patches@gnu.org; Thu, 16 May 2024 11:00:06 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id F368927BBE2 for ; Thu, 16 May 2024 16:00:02 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 3d9990d5 for ; Thu, 16 May 2024 14:59:59 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH 0/4] Use specific errors for unsupported targets User-Agent: mu4e 1.12.2; emacs 29.3 Date: Thu, 16 May 2024 15:59:56 +0100 Message-ID: <878r09ol8z.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; 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: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable I think when computing derivations any errors except from a small list should be treated as bugs. This has become more of an issue with the avr, or1k-elf and xtensa-ath9k-elf targets since these targets both seem to not support a large number of packages, and lead to generic errors or crashes. I'm seeing this because logs relating to errors computing package derivations are now taking up most of the data service logs around processing revisions. Christopher Baines (4): guix: packages: Add new &package-unsupported-target-error. gnu: tls: Raise conditions from target->openssl-target. gnu: cross-libc*: Raise conditions rather than returning #f. guix: build-system: meson: Don't error on unsupported targets. gnu/packages/cross-base.scm | 12 +++- gnu/packages/tls.scm | 17 ++++-- guix/build-system/meson.scm | 115 +++++++++++++++++++----------------- guix/packages.scm | 7 +++ guix/ui.scm | 7 +++ 5 files changed, 98 insertions(+), 60 deletions(-) base-commit: 5a624adfd7b14c3717237d137bd0766c77f0f570 =2D-=20 2.41.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZGH2xfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xc2VQ/+NEugFVSwrjA1aKwpovG4rYnJ2hvWyXyA sm4fUWzjSlHCbwA7gZYm/1Y3rIsmcnr6HgtDOm3E8GiGdfx4PCOWfOwQ0vGJdJnL i2C6yOI6DS5o5wwMDJB85o3I7pkkn9HO1fuUPADHm9ea7Zbm4mI1a8FmYednJrQH 4iV7z6UpDVp7LkQ83u2Q5RymGROKb0xhuKwNhKFQ3lt5crXPCOTnLM+bGo/Hh6O+ sHqlcX4v9APkugblsI63/n8QS/6dXwgeDBxvrz6sZyWrI6cTxo5YLMzMw1Z1x/tR LFyySohpuE2qtRZwaQQqplt5AVP8FGjrUf7PCqwZjJEu+TpeshwRp25TkRv4TdHT DXplRevF9et/1U336pkpMAOhgyeHu1oUqzr56dPvH6dlB+eUZJqZbcxW2W2rOg63 c7e2qv1ZI0kTMbrWLUk6ig5idsRGK72KkI3BcVCx6+12FYql5EZ2fTITTTTREvvR 2j1IxM8WOIBH0M12gQO+KeUhb5g0rFq6u8uYOtcyjTr492r70U7aGb3ThETDuwFh 1i1U7dDzPmduZRNXuUFSjSKg8aAD9UzFM79IXZsVA/mlW9ZRnH+ymPLzOtpWiU28 9o5WipSqJvYqzK7PkNEYuZtUVZOUUmBMOFUBh4TadJ3gPT1Fk0qIpYhU8VBPpRGq rtfzCuJl4Gg= =N3ZT -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:06:20 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:06:20 +0000 Received: from localhost ([127.0.0.1]:49214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgW-0007kh-FA for submit@debbugs.gnu.org; Thu, 16 May 2024 11:06:20 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgT-0007kb-3O for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:06:18 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id 5954A27BBEA for <70985@debbugs.gnu.org>; Thu, 16 May 2024 16:06:11 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 9605db93 for <70985@debbugs.gnu.org>; Thu, 16 May 2024 15:06:08 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH 3/4] gnu: cross-libc*: Raise conditions rather than returning #f. Date: Thu, 16 May 2024 16:06:05 +0100 Message-ID: <05efcc4bcf0dc4b270930747d215a97b2bd86761.1715871966.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) As this means that the error will be clearer for targets which are unsupported. * gnu/packages/cross-base.scm (cross-libc*): Raise conditions rather than returning #f. Change-Id: I820780ad738d85a98950de5608f3019e961ff7c8 --- gnu/packages/cross-base.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2cc5f52e47..0488e397ef 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -46,6 +46,8 @@ (define-module (gnu packages cross-base) #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:export (cross-binutils @@ -671,8 +673,8 @@ (define* (cross-libc* target (xbinutils (cross-binutils target)) (xheaders (cross-kernel-headers target))) "Return LIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS -and the cross tool chain. If TARGET doesn't have a standard C library #f is -returned." +and the cross tool chain. If TARGET doesn't have a standard C library an +exception is raised." (match target ((? target-mingw?) (let ((machine (substring target 0 (string-index target #\-)))) @@ -745,7 +747,11 @@ (define* (cross-libc* target ((? target-avr?) (make-avr-libc #:xbinutils xbinutils #:xgcc xgcc)) - (else #f))) + (else + (raise (condition + (&package-unsupported-target-error + (package libc) + (target target))))))) (define* (cross-gcc-toolchain/implementation target #:key -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:06:46 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:06:46 +0000 Received: from localhost ([127.0.0.1]:49221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgv-0007lD-SN for submit@debbugs.gnu.org; Thu, 16 May 2024 11:06:46 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgt-0007ku-FU for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:06:43 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id 4B31E27BBE2 for <70985@debbugs.gnu.org>; Thu, 16 May 2024 16:06:10 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 23d91321 for <70985@debbugs.gnu.org>; Thu, 16 May 2024 15:06:08 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH 1/4] guix: packages: Add new &package-unsupported-target-error. Date: Thu, 16 May 2024 16:06:03 +0100 Message-ID: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Some packages don't support cross building to specific targets, so add a error type to signal this. * guix/packages.scm (&package-unsupported-target-error): New condition type. [package-unsupported-target-error? package-unsupported-target-error-target): New procedures. * guix/ui.scm (call-with-error-handling): Handle this new condition type. Change-Id: Ib47813399e04b20d616a95f545b6aabe25736e92 --- guix/packages.scm | 7 +++++++ guix/ui.scm | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index abe89cdb07..7fbb8d126b 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -173,6 +173,9 @@ (define-module (guix packages) package-error-invalid-input &package-cross-build-system-error package-cross-build-system-error? + &package-unsupported-target-error + package-unsupported-target-error? + package-unsupported-target-error-target package->bag bag->derivation @@ -850,6 +853,10 @@ (define-condition-type &package-cyclic-dependency-error &package-error (define-condition-type &package-cross-build-system-error &package-error package-cross-build-system-error?) +(define-condition-type &package-unsupported-target-error &package-error + package-unsupported-target-error? + (target package-unsupported-target-error-target)) + (define* (package-full-name package #:optional (delimiter "@")) "Return the full name of PACKAGE--i.e., `NAME@VERSION'. By specifying DELIMITER (a string), you can customize what will appear between the name and diff --git a/guix/ui.scm b/guix/ui.scm index d82fa533cc..0bb1b3b3ba 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -756,6 +756,13 @@ (define (call-with-error-handling thunk) (location->string loc) (package-full-name package) (build-system-name system)))) + ((package-unsupported-target-error? c) + (let* ((package (package-error-package c)) + (loc (package-location package))) + (leave (G_ "~a: ~a: does not support target `~a'~%") + (location->string loc) + (package-full-name package) + (package-unsupported-target-error-target c)))) ((gexp-input-error? c) (let ((input (gexp-error-invalid-input c))) (leave (G_ "~s: invalid G-expression input~%") base-commit: 5a624adfd7b14c3717237d137bd0766c77f0f570 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:06:46 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:06:46 +0000 Received: from localhost ([127.0.0.1]:49223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgw-0007lF-8A for submit@debbugs.gnu.org; Thu, 16 May 2024 11:06:46 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgt-0007kv-UM for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:06:44 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id CE87A27BBE9 for <70985@debbugs.gnu.org>; Thu, 16 May 2024 16:06:10 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7177d07f for <70985@debbugs.gnu.org>; Thu, 16 May 2024 15:06:08 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH 2/4] gnu: tls: Raise conditions from target->openssl-target. Date: Thu, 16 May 2024 16:06:04 +0100 Message-ID: <1f3d2facacce8938a74c241e051dc43550327cee.1715871966.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Rather than rasising generic errors. * gnu/packages/tls.scm (target->openssl-target): Raise conditions rather than generic errors. (openssl-1.1): Call target->openssl-target with the package. Change-Id: I13c63328cdf6bc177b20879805246ad94ff2665b --- gnu/packages/tls.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 719da8e113..f04e171a9b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -84,7 +84,9 @@ (define-module (gnu packages tls) #:use-module (gnu packages time) #:use-module (gnu packages version-control) #:use-module (gnu packages base) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) (define-public libtasn1 (package @@ -390,7 +392,7 @@ (define-public guile2.2-gnutls (modify-inputs (package-inputs guile-gnutls) (replace "guile" guile-2.2))))) -(define (target->openssl-target target) +(define (target->openssl-target pkg target) "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling OpenSSL for TARGET." ;; Keep this code outside the build code, @@ -411,7 +413,10 @@ (define (target->openssl-target target) ((target-linux? target) "linux") (else - (error "unsupported openssl target kernel")))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target))))))) (arch (cond ((target-x86-32? target) @@ -438,7 +443,10 @@ (define (target->openssl-target target) ((target-64bit? target) "generic64") (else - (error "unsupported openssl target architecture"))))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target)))))))) (string-append kernel "-" arch)))) (define-public openssl-1.1 @@ -488,6 +496,7 @@ (define-public openssl-1.1 (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" #$(target->openssl-target + this-package (%current-target-system)))))) #~()) #$@(if (target-hurd?) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:06:52 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:06:52 +0000 Received: from localhost ([127.0.0.1]:49227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7ch1-0007lW-Sl for submit@debbugs.gnu.org; Thu, 16 May 2024 11:06:52 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cgu-0007l6-UL for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:06:45 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id D948A27BBEB for <70985@debbugs.gnu.org>; Thu, 16 May 2024 16:06:11 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c8131ea3 for <70985@debbugs.gnu.org>; Thu, 16 May 2024 15:06:08 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH 4/4] guix: build-system: meson: Don't error on unsupported targets. Date: Thu, 16 May 2024 16:06:06 +0100 Message-ID: <1f217c47d4494a29035dd136c2672771990c0eb0.1715871966.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Rather than raising generic errors. * guix/build-system/meson.scm (make-machine-alist): Return #f if the triplet is unsupported. (lower): Return #f if the machine alist is #f. Change-Id: If6a1f8d1c2073e43107406ac186aa9c845005a95 --- guix/build-system/meson.scm | 115 +++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 53 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index bf9ca15ecc..b321417773 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -46,39 +46,46 @@ (define (make-machine-alist triplet) "Make an association list describing what should go into the ‘host_machine’ section of the cross file when cross-compiling for TRIPLET." - `((system . ,(cond ((target-hurd? triplet) "gnu") - ((target-linux? triplet) "linux") - ((target-mingw? triplet) "windows") - ((target-avr? triplet) "none") - (#t (error "meson: unknown operating system")))) - (cpu_family . ,(cond ((target-x86-32? triplet) "x86") + (let ((system + (cond + ((target-hurd? triplet) "gnu") + ((target-linux? triplet) "linux") + ((target-mingw? triplet) "windows") + ((target-avr? triplet) "none") + (else #f))) + (cpu-family + (cond ((target-x86-32? triplet) "x86") + ((target-x86-64? triplet) "x86_64") + ((target-arm32? triplet) "arm") + ((target-aarch64? triplet) "aarch64") + ((target-avr? triplet) "avr") + ((target-mips64el? triplet) "mips64") + ((target-powerpc? triplet) + (if (target-64bit? triplet) + "ppc64" + "ppc")) + ((target-riscv64? triplet) "riscv64") + (else #f)))) + (and system + cpu-family + `((system . ,system) + (cpu_family . ,cpu-family) + (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 + (substring triplet 0 4)) ((target-x86-64? triplet) "x86_64") - ((target-arm32? triplet) "arm") - ((target-aarch64? triplet) "aarch64") + ((target-aarch64? triplet) "armv8-a") + ((target-arm32? triplet) "armv7") ((target-avr? triplet) "avr") - ((target-mips64el? triplet) "mips64") - ((target-powerpc? triplet) - (if (target-64bit? triplet) - "ppc64" - "ppc")) - ((target-riscv64? triplet) "riscv64") - (#t (error "meson: unknown architecture")))) - (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 - (substring triplet 0 4)) - ((target-x86-64? triplet) "x86_64") - ((target-aarch64? triplet) "armv8-a") - ((target-arm32? triplet) "armv7") - ((target-avr? triplet) "avr") - ;; According to #mesonbuild on OFTC, there does not appear - ;; to be an official-ish list of CPU types recognised by - ;; Meson, the "cpu" field is not used by Meson itself and - ;; most software doesn't look at this field, except perhaps - ;; for selecting optimisations, so set it to something - ;; arbitrary. - (#t "strawberries"))) - (endian . ,(if (target-little-endian? triplet) - "little" - "big")))) + ;; According to #mesonbuild on OFTC, there does not appear + ;; to be an official-ish list of CPU types recognised by + ;; Meson, the "cpu" field is not used by Meson itself and + ;; most software doesn't look at this field, except perhaps + ;; for selecting optimisations, so set it to something + ;; arbitrary. + (#t "strawberries"))) + (endian . ,(if (target-little-endian? triplet) + "little" + "big")))))) (define (make-binaries-alist triplet) "Make an associatoin list describing what should go into @@ -146,29 +153,31 @@ (define* (lower name '() '(#:target)))) - (bag - (name name) - (system system) (target target) - (build-inputs `(("meson" ,meson) - ("ninja" ,ninja) - ,@native-inputs - ,@(if target '() inputs) - ;; Keep the standard inputs of 'gnu-build-system'. - ,@(if target - (standard-cross-packages target 'host) + (and + (make-machine-alist target) + (bag + (name name) + (system system) (target target) + (build-inputs `(("meson" ,meson) + ("ninja" ,ninja) + ,@native-inputs + ,@(if target '() inputs) + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(if target + (standard-cross-packages target 'host) + '()) + ,@(standard-packages))) + (host-inputs `(,@(if source + `(("source" ,source)) '()) - ,@(standard-packages))) - (host-inputs `(,@(if source - `(("source" ,source)) - '()) - ,@(if target inputs '()))) - ;; Keep the standard inputs of 'gnu-buid-system'. - (target-inputs (if target - (standard-cross-packages target 'target) - '())) - (outputs outputs) - (build (if target meson-cross-build meson-build)) - (arguments (strip-keyword-arguments private-keywords arguments)))) + ,@(if target inputs '()))) + ;; Keep the standard inputs of 'gnu-buid-system'. + (target-inputs (if target + (standard-cross-packages target 'target) + '())) + (outputs outputs) + (build (if target meson-cross-build meson-build)) + (arguments (strip-keyword-arguments private-keywords arguments))))) (define* (meson-build name inputs #:key -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:13:49 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:13:49 +0000 Received: from localhost ([127.0.0.1]:49267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cnl-0007tp-AI for submit@debbugs.gnu.org; Thu, 16 May 2024 11:13:49 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:33202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cng-0007th-73 for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:13:48 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 8512D1FE1; Thu, 16 May 2024 17:13:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qW-lyZ3H1hZS; Thu, 16 May 2024 17:13:34 +0200 (CEST) Received: from ribbon (unknown [193.50.110.250]) by hera.aquilenet.fr (Postfix) with ESMTPSA id EBE2E1F41; Thu, 16 May 2024 17:13:33 +0200 (CEST) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#70985] [PATCH 4/4] guix: build-system: meson: Don't error on unsupported targets. In-Reply-To: <1f217c47d4494a29035dd136c2672771990c0eb0.1715871966.git.mail@cbaines.net> (Christopher Baines's message of "Thu, 16 May 2024 16:06:06 +0100") References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> <1f217c47d4494a29035dd136c2672771990c0eb0.1715871966.git.mail@cbaines.net> Date: Thu, 16 May 2024 17:13:32 +0200 Message-ID: <87jzjtbxib.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, Christopher Baines writes: > Rather than raising generic errors. > > * guix/build-system/meson.scm (make-machine-alist): Return #f if the trip= let > is unsupported. > (lower): Return #f if the machine alist is #f. > > Change-Id: If6a1f8d1c2073e43107406ac186aa9c845005a95 [...] > + (and > + (make-machine-alist target) I think this call is unnecessary (and kinda confusing because =E2=80=98make-machine-alist=E2=80=99 is a pure function) because =E2=80=98m= eson-cross-build=E2=80=99 calls =E2=80=98make-cross-file=E2=80=99, which calls =E2=80=98make-machine-= alist=E2=80=99. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:15:49 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:15:49 +0000 Received: from localhost ([127.0.0.1]:49284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cph-0007wB-3r for submit@debbugs.gnu.org; Thu, 16 May 2024 11:15:49 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:42580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7cpf-0007w0-K9 for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:15:48 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CD08D1F83; Thu, 16 May 2024 17:15:09 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FsqN87hjBx67; Thu, 16 May 2024 17:15:09 +0200 (CEST) Received: from ribbon (unknown [193.50.110.250]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 538E61F41; Thu, 16 May 2024 17:15:09 +0200 (CEST) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#70985] [PATCH 3/4] gnu: cross-libc*: Raise conditions rather than returning #f. In-Reply-To: <05efcc4bcf0dc4b270930747d215a97b2bd86761.1715871966.git.mail@cbaines.net> (Christopher Baines's message of "Thu, 16 May 2024 16:06:05 +0100") References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> <05efcc4bcf0dc4b270930747d215a97b2bd86761.1715871966.git.mail@cbaines.net> Date: Thu, 16 May 2024 17:15:08 +0200 Message-ID: <87h6exbxfn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Christopher Baines writes: > As this means that the error will be clearer for targets which are > unsupported. > > * gnu/packages/cross-base.scm (cross-libc*): Raise conditions rather than > returning #f. > > Change-Id: I820780ad738d85a98950de5608f3019e961ff7c8 [...] > - (else #f))) > + (else > + (raise (condition > + (&package-unsupported-target-error > + (package libc) > + (target target))))))) What I'm unsure is whether this works with libc-less triplets such as =E2=80=98avr=E2=80=99 or =E2=80=98or1k-elf=E2=80=99. If it does, LGTM. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 11:17:41 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 15:17:41 +0000 Received: from localhost ([127.0.0.1]:49294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7crV-0007xr-H8 for submit@debbugs.gnu.org; Thu, 16 May 2024 11:17:41 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:46214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7crT-0007xl-Fh for 70985@debbugs.gnu.org; Thu, 16 May 2024 11:17:40 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CE96A1F83; Thu, 16 May 2024 17:17:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iKfgs8h_e9Xk; Thu, 16 May 2024 17:17:00 +0200 (CEST) Received: from ribbon (unknown [193.50.110.250]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 608461F41; Thu, 16 May 2024 17:17:00 +0200 (CEST) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#70985] [PATCH 0/4] Use specific errors for unsupported targets In-Reply-To: <878r09ol8z.fsf@cbaines.net> (Christopher Baines's message of "Thu, 16 May 2024 15:59:56 +0100") References: <878r09ol8z.fsf@cbaines.net> Date: Thu, 16 May 2024 17:16:59 +0200 Message-ID: <87eda1bxck.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Christopher Baines writes: > I think when computing derivations any errors except from a small list > should be treated as bugs. > > This has become more of an issue with the avr, or1k-elf and > xtensa-ath9k-elf targets since these targets both seem to not support a > large number of packages, and lead to generic errors or crashes. > > I'm seeing this because logs relating to errors computing package > derivations are now taking up most of the data service logs around > processing revisions. Looks to me like a much welcome improvement, modulo the minor issues I commented on. Thanks! Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 12:10:41 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 16:10:41 +0000 Received: from localhost ([127.0.0.1]:49578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dgn-0000JL-2s for submit@debbugs.gnu.org; Thu, 16 May 2024 12:10:41 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dgl-0000JD-4K for 70985@debbugs.gnu.org; Thu, 16 May 2024 12:10:40 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id C6CB427BBE2; Thu, 16 May 2024 17:10:35 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5014c898; Thu, 16 May 2024 16:10:34 +0000 (UTC) From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#70985] [PATCH 4/4] guix: build-system: meson: Don't error on unsupported targets. In-Reply-To: <87jzjtbxib.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Thu, 16 May 2024 17:13:32 +0200") References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> <1f217c47d4494a29035dd136c2672771990c0eb0.1715871966.git.mail@cbaines.net> <87jzjtbxib.fsf@gnu.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Thu, 16 May 2024 17:10:16 +0100 Message-ID: <87r0e1n3fb.fsf@cbaines.net> 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: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Christopher Baines writes: > >> Rather than raising generic errors. >> >> * guix/build-system/meson.scm (make-machine-alist): Return #f if the tri= plet >> is unsupported. >> (lower): Return #f if the machine alist is #f. >> >> Change-Id: If6a1f8d1c2073e43107406ac186aa9c845005a95 > > [...] > >> + (and >> + (make-machine-alist target) > > I think this call is unnecessary (and kinda confusing because > =E2=80=98make-machine-alist=E2=80=99 is a pure function) because =E2=80= =98meson-cross-build=E2=80=99 > calls =E2=80=98make-cross-file=E2=80=99, which calls =E2=80=98make-machin= e-alist=E2=80=99. The situation here is that the meson build system does support cross builds, but make-machine-alist calls error for some targets which I'm treating as a bug here, because error isn't really machine readable. I think this line should actually be (or (not target) (make-machine-alist target)) to handle the case where the target is #f, but this is sort of helpful in that it changes the error to the usual error when the build system doesn't support cross builds. This is still far from perfect though as the UI would say that "build system `meson' does not support cross builds", which is obviously wrong, it just doesn't support cross builds for the given target. I'm not sure how to signal this though? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZGL+hfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeM9xAAgX33MTDVeDWUVmgzAkuIhcxuWiIC46lI Bm7F4xXBAP07gpXsyAr+fzjdlK68ETBzRHXVJFRaFZMQnrHQ6JFJiYpLFu+pyrAC c0vGVRAiJdBJOjdeUSiJ22F7eiMdeJktZ3ucvi90Cm7YcnlcPG8F+Wue0Pe011kH JmMQs6/4YmrG26m6HLI6KvLNik4W3xOf8Ch+oOgNHDMySqFK3OmwBNDOXnxSdGWM klh603MvRxwXoHXUNpbBN/JOq2ksEs99bqg1rD4C2P6C8G+PCXgaTt/YIZW99gai 2xtNEib/ouVqIQrnAtd9u2+KTVXktD0c4Bfg/h7rxmrrrzibTtNfqCyRx0lNLida KqZCDpRhsvCvXdWfCT/1TTYXb4OQzn6xHmLnsqRbSVTmBk9XCzEdePwfzIIdwdGl FIyqmtIQHpL7P4uVL1NL4yAliS2D9pt8hGMa4OSiibAWEMxceYu6NiXfYhtZ/NoX GWg8hiIxWq18AZmN+oBjde3oCQNSGkXoVTh10wNNhJdTG+Rywn+VFDcOHK47GIL6 Lu8KDo6yP+x62LtFAwNFdNEIC/sp2CdDSNIMK7szre3uWYvx84yrnj05osHwvmcG 66zQdQjEEsmIS919LtzwKI/2tHT9GT0Cn0v0Hc0axtKxuxJkeEvwpTvxXv3SHG4w gb3MBCXlSRM= =Q6Hk -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 16 12:17:27 2024 Received: (at 70985) by debbugs.gnu.org; 16 May 2024 16:17:27 +0000 Received: from localhost ([127.0.0.1]:49628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dnK-0000Pl-ML for submit@debbugs.gnu.org; Thu, 16 May 2024 12:17:27 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dnH-0000PY-F4 for 70985@debbugs.gnu.org; Thu, 16 May 2024 12:17:23 -0400 Received: from localhost (unknown [45.67.83.153]) by mira.cbaines.net (Postfix) with ESMTPSA id 67C1A27BBE2; Thu, 16 May 2024 17:16:49 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b1ab4150; Thu, 16 May 2024 16:16:45 +0000 (UTC) From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#70985] [PATCH 3/4] gnu: cross-libc*: Raise conditions rather than returning #f. In-Reply-To: <87h6exbxfn.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Thu, 16 May 2024 17:15:08 +0200") References: <3828bc238a8cc400f9686fe6856c665c31e927dd.1715871966.git.mail@cbaines.net> <05efcc4bcf0dc4b270930747d215a97b2bd86761.1715871966.git.mail@cbaines.net> <87h6exbxfn.fsf@gnu.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Thu, 16 May 2024 17:16:42 +0100 Message-ID: <87le49n34l.fsf@cbaines.net> 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: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Christopher Baines writes: > >> As this means that the error will be clearer for targets which are >> unsupported. >> >> * gnu/packages/cross-base.scm (cross-libc*): Raise conditions rather than >> returning #f. >> >> Change-Id: I820780ad738d85a98950de5608f3019e961ff7c8 > > [...] > >> - (else #f))) >> + (else >> + (raise (condition >> + (&package-unsupported-target-error >> + (package libc) >> + (target target))))))) > > What I'm unsure is whether this works with libc-less triplets such as > =E2=80=98avr=E2=80=99 or =E2=80=98or1k-elf=E2=80=99. Hmm, it seems like this is erroring in some cases where it didn't before, I'm not sure why though. I ended up here through rust-sysroot-for-... since it calls cross-libc. Handling cross-libc returning #f in the packages which use it seems error prone, hence adding the exception inside of cross-libc*. It looks liek cross-gcc-toolchain/implementation is expecting cross-libc to return #f in some cases though, so maybe I need to add a guard there somehow to handle the exception and ignore it, as happens when it returns #f. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZGMWpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdE5w//bVPBGIo8sv+MEkKtEtlrIBfIH8jfgS5a uvU2ZKOfvvLRX0Ywe8EVJ2DDgCfSN96G1/nz7XbmkYBnTdHNu+eUV+/6+RqDxrmG lSXyz1QvmRNql6kj4V5upp+N6/Uwr0BRummunBcbaJDJJUKtE+bXq5VST0sQMLAa VDNFN++2kBAoUaCKQpcsh7dGyaApY47K61QWrgpcM5kWH+1luqq31mDlUadzVN8f laPoOXFxiFOi0nzj0v9pQZOOho35Yl0e0nhSV5u8WO0efj374glQgVhSVwY+AUaC uRxY/qQaj615pa1bLSGsic+656uviQAuh1aTSuqpCJqORZWemBUcOWAIXgBiO2vh 77NH1A2B8CnRqyehrVVpH/YXwoOozIYY1xO73GIGwDfDU4Qv6oKulZB1qDM4Dt/U 5RNeQKEJQcAQKV09z0ZUrnnSWsibGf1kiFN88ht6CLOL9stbd1sqbvE+7L+I8gYb Yc3QweqwVEa6H6XbOLpEfpVFSHJ6HSZrhYoeiBXOmfIfOZeebkG7zwzLiaStXTCw fCFqIXBKBHjUUv8hpuk/AP5dtZEF+y7hngaNH/gOUcoVPj7FokfxzpBSNHNLzRXy 1+AiSHAUmooOET8zagzqKj473GK6T9NMoAOvOd2tFDmBV51VT5XMEwz+UAmuVp7Z qZcjmsAZQho= =k2Fx -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 17 05:54:41 2024 Received: (at 70985) by debbugs.gnu.org; 17 May 2024 09:54:41 +0000 Received: from localhost ([127.0.0.1]:54263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7uIT-0004He-D0 for submit@debbugs.gnu.org; Fri, 17 May 2024 05:54:41 -0400 Received: from mail-ua1-f46.google.com ([209.85.222.46]:60505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7uIN-0004HY-Gd for 70985@debbugs.gnu.org; Fri, 17 May 2024 05:54:39 -0400 Received: by mail-ua1-f46.google.com with SMTP id a1e0cc1a2514c-7fe97255d03so229176241.0 for <70985@debbugs.gnu.org>; Fri, 17 May 2024 02:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1715939607; x=1716544407; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=GwOwtvWDee9F+5s0BUbREO9tLD7H6vTe+5qrF1mEq1w=; b=rqtc/8u7t0f4c5preOxxSnwCR3AsAuaqKP3i83LyVj1WMXgqAi6ImdEYZuzxU5sf9B 4hQpsppJWxU0Djv21n5p7St+eS8AE3WchwisWIEArLoFdyvqeraX/hSELKGfQgEj/kBl gBn0ROarCxAgOpXjKRgOE5c5R9GbgCOtnkR6+X3ss7yXpn8x04BNmGimz0hnV4X6+wjf zzpritekH4Hbut6CACQm6CpR20QmTyY5h3eT+5Mmeru5SA+6LWIeyWDqTtIAkXK4F0R+ As+FnlxUQXkUGdrCLPVfMa4achMIDQMO81FZB5o7QPCpnOLbC9qCt45n7WBg+gwiz2zT jw5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715939607; x=1716544407; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GwOwtvWDee9F+5s0BUbREO9tLD7H6vTe+5qrF1mEq1w=; b=Cx/o2dPTo6kiCSAb//T2hWGC45fqX9K1uCCkFa+ddPzK3gHchNE0Mw+ADObr40gI2R OmLmIurjVXsxon72JlA7y5rs7SYdQl86wo3b9u6qLOtUUZw0wX8nVxEZ8JaQvkAeE+zX kEx2QMi2GZGWBCf4FVb3ycaoLbMKDNrSiHgA7ChCg9OXmtUsWjuY0l4eYKDFWNe4xYLm bxPxr2PHOGShLGv2BfC8HkxEPOJBTabRauN8iQ2vMBh8VGnPS55RfzQ8Azb3tGZilG+/ VNVYJ3kFNvO0YfXLDXD919qllpLekAe6jopFCR4LECwHLx/dj6I164paBRdyFewXruYK ng/w== X-Gm-Message-State: AOJu0YyX9yWuytxWNrTGlRsQKUZVbclqaVbPnNUDHW3TIHePehwL3nLm GHw7haVQBbAb7Zk328umHjb+H718ynrn8FXzyelDORGn9w3c5absYP5YZIfaowB6mV88eUqrgWg 2UnCPkzy7qFK3gn5pzLC++8fmBQiwRBI27Ob6O+bbVJ8CWamA6r8= X-Google-Smtp-Source: AGHT+IGJZcIkTs49WsenQ88XwPZFJeerCC3cbiKK70PfuSH9fBHNDY/EFGeCzVISiUkgRIfSczadRq/+1RjzsIJi/mE= X-Received: by 2002:a05:6102:390c:b0:47e:b219:8f11 with SMTP id ada2fe7eead31-48077eb49camr24404890137.29.1715939607045; Fri, 17 May 2024 02:53:27 -0700 (PDT) MIME-Version: 1.0 From: Jean-Pierre De Jesus Diaz Date: Fri, 17 May 2024 09:53:16 +0000 Message-ID: Subject: Re: [bug#70985] [PATCH 3/4] gnu: cross-libc*: Raise conditions rather than returning #f. To: 70985@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70985 Cc: ludo@gnu.org, mail@cbaines.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, >> Christopher Baines writes: >> >>> As this means that the error will be clearer for targets which are >>> unsupported. >>> >>> * gnu/packages/cross-base.scm (cross-libc*): Raise conditions rather th= an >>> returning #f. >>> >>> Change-Id: I820780ad738d85a98950de5608f3019e961ff7c8 >> >> [...] >> >>> - (else #f))) >>> + (else >>> + (raise (condition >>> + (&package-unsupported-target-error >>> + (package libc) >>> + (target target))))))) >> >> What I'm unsure is whether this works with libc-less triplets such as >> =E2=80=98avr=E2=80=99 or =E2=80=98or1k-elf=E2=80=99. > >Hmm, it seems like this is erroring in some cases where it didn't >before, I'm not sure why though. > >I ended up here through rust-sysroot-for-... since it calls >cross-libc. Handling cross-libc returning #f in the packages which use >it seems error prone, hence adding the exception inside of cross-libc*. > >It looks liek cross-gcc-toolchain/implementation is expecting cross-libc >to return #f in some cases though, so maybe I need to add a guard there >somehow to handle the exception and ignore it, as happens when it >returns #f. This is because some targets as Ludovic mentioned don't have a proper libc, like most *-elf targets. Also, gnu-build-system also depends on cross-libc returning #f to check for those targets that don't have a libc in `cross-standard-packages'. Thanks, Jean-Pierre From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 12:06:15 2024 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:16 +0000 Received: from localhost ([127.0.0.1]:44841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlRv-0003ME-IL for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:15 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlRs-0003Lw-1S for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:13 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id 2A8D727BBE9 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:06 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 522beaf1 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:04 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v2 2/6] gnu: tls: Raise conditions from target->openssl-target. Date: Fri, 5 Jul 2024 18:05:59 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Rather than rasising generic errors. * gnu/packages/tls.scm (target->openssl-target): Raise conditions rather than generic errors. (openssl-1.1): Call target->openssl-target with the package. Change-Id: I13c63328cdf6bc177b20879805246ad94ff2665b --- gnu/packages/tls.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 760b917768..fdc003731d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -84,7 +84,9 @@ (define-module (gnu packages tls) #:use-module (gnu packages time) #:use-module (gnu packages version-control) #:use-module (gnu packages base) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) (define-public libtasn1 (package @@ -390,7 +392,7 @@ (define-public guile2.2-gnutls (modify-inputs (package-inputs guile-gnutls) (replace "guile" guile-2.2))))) -(define (target->openssl-target target) +(define (target->openssl-target pkg target) "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling OpenSSL for TARGET." ;; Keep this code outside the build code, @@ -411,7 +413,10 @@ (define (target->openssl-target target) ((target-linux? target) "linux") (else - (error "unsupported openssl target kernel")))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target))))))) (arch (cond ((target-x86-32? target) @@ -438,7 +443,10 @@ (define (target->openssl-target target) ((target-64bit? target) "generic64") (else - (error "unsupported openssl target architecture"))))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target)))))))) (string-append kernel "-" arch)))) (define-public openssl-1.1 @@ -488,6 +496,7 @@ (define-public openssl-1.1 (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" #$(target->openssl-target + this-package (%current-target-system)))))) #~()) #$@(if (target-hurd?) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 12:06:16 2024 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:16 +0000 Received: from localhost ([127.0.0.1]:44843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlRv-0003MG-Uh for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:16 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlRu-0003M6-C1 for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:14 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id 62B6227BBED for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:07 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 68b68a3c for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:05 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v2 6/6] build-system: go: Properly handle when a target is unsupported. Date: Fri, 5 Jul 2024 18:06:03 +0200 Message-ID: <16cfdbf20bb508ae12cdba675467a727ba7c1e6b.1720195563.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build-system/go.scm (go-target): Properly handle when a target is unsupported. Change-Id: Ibc0becb8eb0a712d21116112c44e2bbbb707ddf4 --- guix/build-system/go.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 0934fded07..fc53b3be9f 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -33,6 +33,8 @@ (define-module (guix build-system go) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (%go-build-system-modules go-build go-build-system @@ -101,7 +103,13 @@ (define (go-target target) (_ arch)) (match os ((or "mingw32" "cygwin") "windows") - (_ os)))))) + (_ os)))) + (_ + (raise + (condition + (&unsupported-cross-compilation-target-error + (build-system go-build-system) + (target target))))))) (define %go-build-system-modules ;; Build-side modules imported and used by default. -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 12:06:42 2024 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:42 +0000 Received: from localhost ([127.0.0.1]:44849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSM-0003NL-9d for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSK-0003Mv-MG for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:41 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id D12AD27BBE2 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:05 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 35b46bd2 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:04 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v2 1/6] guix: packages: Add new &package-unsupported-target-error. Date: Fri, 5 Jul 2024 18:05:58 +0200 Message-ID: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Some packages don't support cross building to specific targets, so add a error type to signal this. * guix/packages.scm (&package-unsupported-target-error): New condition type. [package-unsupported-target-error? package-unsupported-target-error-target): New procedures. * guix/ui.scm (call-with-error-handling): Handle this new condition type. Change-Id: Ib47813399e04b20d616a95f545b6aabe25736e92 --- guix/packages.scm | 7 +++++++ guix/ui.scm | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index f3a9a61785..e793714f2e 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -173,6 +173,9 @@ (define-module (guix packages) package-error-invalid-input &package-cross-build-system-error package-cross-build-system-error? + &package-unsupported-target-error + package-unsupported-target-error? + package-unsupported-target-error-target package->bag bag->derivation @@ -850,6 +853,10 @@ (define-condition-type &package-cyclic-dependency-error &package-error (define-condition-type &package-cross-build-system-error &package-error package-cross-build-system-error?) +(define-condition-type &package-unsupported-target-error &package-error + package-unsupported-target-error? + (target package-unsupported-target-error-target)) + (define* (package-full-name package #:optional (delimiter "@")) "Return the full name of PACKAGE--i.e., `NAME@VERSION'. By specifying DELIMITER (a string), you can customize what will appear between the name and diff --git a/guix/ui.scm b/guix/ui.scm index d82fa533cc..0bb1b3b3ba 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -756,6 +756,13 @@ (define (call-with-error-handling thunk) (location->string loc) (package-full-name package) (build-system-name system)))) + ((package-unsupported-target-error? c) + (let* ((package (package-error-package c)) + (loc (package-location package))) + (leave (G_ "~a: ~a: does not support target `~a'~%") + (location->string loc) + (package-full-name package) + (package-unsupported-target-error-target c)))) ((gexp-input-error? c) (let ((input (gexp-error-invalid-input c))) (leave (G_ "~s: invalid G-expression input~%") base-commit: 5ee2799cabba4b2d462ac064a98789d7bca07923 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 12:06:42 2024 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:43 +0000 Received: from localhost ([127.0.0.1]:44851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSM-0003NO-LT for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSK-0003Mw-RM for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:41 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id 2038A27BBEC for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:07 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id eae7c300 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:05 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Date: Fri, 5 Jul 2024 18:06:02 +0200 Message-ID: <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against cross-libc returning #f. Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 --- gnu/packages/rust.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a385344473..f1de34b277 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -73,7 +73,9 @@ (define-module (gnu packages rust) #:use-module (ice-9 match) #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) ;; This is the hash for the empty file, and the reason it's relevant is not ;; the most obvious. @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation (modify-inputs (package-native-inputs base-rust) (prepend (cross-gcc target #:libc (cross-libc target)) - (cross-libc target) + (or (cross-libc target) ; could be #f + (raise (condition + (&package-unsupported-target-error + (package (libc-for-target target)) + (target target))))) (cross-binutils target))))) (properties `((hidden? . #t) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 12:06:43 2024 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:43 +0000 Received: from localhost ([127.0.0.1]:44853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSM-0003NU-U5 for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:43 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSK-0003Mu-JC for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:41 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id C768A27BBEB for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:06 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2b3c6a89 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:05 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v2 4/6] build-system: meson: Use a more specific exception. Date: Fri, 5 Jul 2024 18:06:01 +0200 Message-ID: <24821cf4bf50dbe149edb9413bfb50219f8c5a0e.1720195563.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is handled by (guix ui). * guix/build-system/meson.scm (make-machine-alist): Use a more specific exception. Change-Id: I842ba63739fdefe04460e938c7bc8aa54ea57b96 --- guix/build-system/meson.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index bf9ca15ecc..04d2241c79 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -30,6 +30,8 @@ (define-module (guix build-system meson) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix packages) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (%meson-build-system-modules meson-build-system make-cross-file)) @@ -50,7 +52,12 @@ (define (make-machine-alist triplet) ((target-linux? triplet) "linux") ((target-mingw? triplet) "windows") ((target-avr? triplet) "none") - (#t (error "meson: unknown operating system")))) + (else + (raise + (condition + (&unsupported-cross-compilation-target-error + (build-system meson-build-system) + (target triplet))))))) (cpu_family . ,(cond ((target-x86-32? triplet) "x86") ((target-x86-64? triplet) "x86_64") ((target-arm32? triplet) "arm") @@ -62,7 +69,12 @@ (define (make-machine-alist triplet) "ppc64" "ppc")) ((target-riscv64? triplet) "riscv64") - (#t (error "meson: unknown architecture")))) + (else + (raise + (condition + (&unsupported-cross-compilation-target-error + (build-system meson-build-system) + (target triplet))))))) (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 (substring triplet 0 4)) ((target-x86-64? triplet) "x86_64") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 05 12:06:43 2024 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:43 +0000 Received: from localhost ([127.0.0.1]:44855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSN-0003Nb-8p for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:43 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSL-0003N4-H8 for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:42 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id 788B727BBEA for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:06 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5d5a43f9 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:04 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v2 3/6] guix: packages: Add &unsupported-cross-compilation-target-error. Date: Fri, 5 Jul 2024 18:06:00 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/packages.scm (&unsupported-cross-compilation-target-error): New variable. * guix/ui.scm (call-with-error-handling): Handle this new condition type. Change-Id: I9e7782ee4799b5fecb3c890a75008c35c003f55d --- guix/packages.scm | 10 ++++++++++ guix/ui.scm | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index e793714f2e..c953db9a03 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -160,6 +160,11 @@ (define-module (guix packages) %cuirass-supported-systems supported-package? + &unsupported-cross-compilation-target-error + unsupported-cross-compilation-target-error? + unsupported-cross-compilation-target-error-build-system + unsupported-cross-compilation-target-error-target + &package-error package-error? package-error-package @@ -834,6 +839,11 @@ (define-syntax-rule (this-package-native-input name) ;; Error conditions. +(define-condition-type &unsupported-cross-compilation-target-error &error + unsupported-cross-compilation-target-error? + (build-system unsupported-cross-compilation-target-error-build-system) + (target unsupported-cross-compilation-target-error-target)) + (define-condition-type &package-error &error package-error? (package package-error-package)) diff --git a/guix/ui.scm b/guix/ui.scm index 0bb1b3b3ba..9db6f6e9d7 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -763,6 +763,13 @@ (define (call-with-error-handling thunk) (location->string loc) (package-full-name package) (package-unsupported-target-error-target c)))) + ((unsupported-cross-compilation-target-error? c) + (let ((build-system + (unsupported-cross-compilation-target-error-build-system c)) + (target (unsupported-cross-compilation-target-error-target c))) + (leave (G_ "the `~a' build system: does not support target `~a'~%") + (build-system-name build-system) + target))) ((gexp-input-error? c) (let ((input (gexp-error-invalid-input c))) (leave (G_ "~s: invalid G-expression input~%") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 12:27:49 2024 Received: (at 70985) by debbugs.gnu.org; 7 Jul 2024 16:27:49 +0000 Received: from localhost ([127.0.0.1]:49028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQUjs-00045h-NH for submit@debbugs.gnu.org; Sun, 07 Jul 2024 12:27:49 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:48513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQUjq-00045V-RQ for 70985@debbugs.gnu.org; Sun, 07 Jul 2024 12:27:47 -0400 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-44634afb2e7so27720921cf.1 for <70985@debbugs.gnu.org>; Sun, 07 Jul 2024 09:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720369597; x=1720974397; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=15SJFXjlf524RGts1Z1nkLgPIsPpAZmXzrGfAkZlTkc=; b=aLVlo+Z79S+n/0VzM1t0GWT91GgYxo2qwEJIas6k2Oljojbd5WrsNwXYRNsW270Iuj LgH+KrFX/A2hWlmxLRiw8dmb//E2x7fDmWh9Nm1eUPz77gZtxRvi8NYURtvNxC8dzISk OJxdCpwPgRopnUdFxx83jmEi3cFO2m0ixev7YZPoUOXYaA2Pknw5LactX2QSaK0HxWpN lTu89eYGP2F5oS+XduHg/llWCtRfZeEmRLfWj+KY01uOAY9wQG6pauaXGMvThBHbc1ZI aHwNRHKCfkKmHCxaJca9Ik6uXA+L3kWrrrzL5Pur5zCqERwQFKViJThfdzM8UREh4P6l FVRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720369597; x=1720974397; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=15SJFXjlf524RGts1Z1nkLgPIsPpAZmXzrGfAkZlTkc=; b=VAot651IvKu9Tcnja1jUJdQTHYdgwUPhRdsiLL6yjuPOZpkb+bWDYZYFhM0X+HQQMt 7knWNth968sXeJjhSI8sCL7NjshbUkBm3uLoaoYl/YvwSnoqhUt5WlJRu0CDJ2ct1gw9 i6orA8wVUI983g2fGSQVZpSYpDDO7YsKei6P+QwBx2jPOBhulgJBdWthxzohc4hf8tUB Io9MOfPTyWoLOFtiTCpBaeTYTrebCF1MB6qR6sxVE6e9rhPbBd5/KJokZl1eKkMklVfl 16pG9bD+tCwK1OnfFxSjnv4sAc/wC9drchZsyX3qNgcRJJolmEuUVGE1sIrFtugmt3Og Nihg== X-Gm-Message-State: AOJu0YzoSYQGJJ+8TFR5sRlzuL1DySB4XFFwHx70iUNR+Eu53+V3f7VT HMkM8HrNmIgeg+qjWNLGuUqhk7GhOiZz8WeHt7mNhazRvwHCwU7E X-Google-Smtp-Source: AGHT+IG9ikZiqWixMgBxsYkZuWZFWZ6Ur5F25gZ4cqCyFBgEDF/amUxxQoAwyHHimEUX/iXnqF4T7A== X-Received: by 2002:a05:622a:1208:b0:441:338c:77da with SMTP id d75a77b69052e-447cbeedb01mr138295851cf.7.1720369596746; Sun, 07 Jul 2024 09:26:36 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447e529b7ccsm12916461cf.79.2024.07.07.09.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:26:36 -0700 (PDT) Date: Sun, 7 Jul 2024 19:26:35 +0300 From: Efraim Flashner To: Christopher Baines Subject: Re: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Message-ID: Mail-Followup-To: Efraim Flashner , Christopher Baines , 70985@debbugs.gnu.org References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oOK2TDWfVhBmsKm+" Content-Disposition: inline In-Reply-To: <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --oOK2TDWfVhBmsKm+ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 05, 2024 at 06:06:02PM +0200, Christopher Baines wrote: > * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against > cross-libc returning #f. >=20 > Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 > --- > gnu/packages/rust.scm | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index a385344473..f1de34b277 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -73,7 +73,9 @@ (define-module (gnu packages rust) > #:use-module (ice-9 match) > #:use-module (ice-9 optargs) > #:use-module (srfi srfi-1) > - #:use-module (srfi srfi-26)) > + #:use-module (srfi srfi-26) > + #:use-module (srfi srfi-34) > + #:use-module (srfi srfi-35)) > =20 > ;; This is the hash for the empty file, and the reason it's relevant is = not > ;; the most obvious. > @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation > (modify-inputs (package-native-inputs base-rust) > (prepend (cross-gcc target > #:libc (cross-libc target)) > - (cross-libc target) > + (or (cross-libc target) ; could be #f > + (raise (condition > + (&package-unsupported-targe= t-error > + (package (libc-for-target = target)) > + (target target))))) > (cross-binutils target))))) > (properties > `((hidden? . #t) > --=20 > 2.45.2 rust does support architectures without a libc, for example the mingw targets a few lines above this snippet. I think it would make more sense to only include (cross-libc target) and not if not. I just tried building zoxide for powerpc-linux-gnu without (cross-libc target) and it tried to link with the x86_64 libc, so it looks like it is necessary where it is available. How about we make this section even worse with: (if (false-if-exception (cross-libc target)) (modify-inputs ... (cross-libc target) ...) (modify-inputs ...)) ; no (cross-libc target) In the meantime, I'll try to figure something out for actually putting everything inside one modify-inputs so we don't have an ever expanding number of them. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --oOK2TDWfVhBmsKm+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaKwbEACgkQQarn3Mo9 g1FDqxAAuTyQYrIzorqMoR0Tp1UIpdGlB05+2l/N8jOXhW1hKDgc6LtwmMAP+gyZ Y+puuSGnhpuJ6CFG1IX4rRuajvkVJHStzo9rpZ7h5RQU/3uPjeaGtRarSJlKX+kq OhlN0CRTce9jUBBh+yKR0Agg/LyYovFwFe/hP5dMye6WU0a6xHPqVJYMUvM1t4pP Tnb3mrtPOCMTUJysyqO4+iIqWJhZ54SmEdkFrZylMq2azc3sOw3w2d0yOLbhrqjc vF294rWVcJUvE0qRgr/SwkTA7JIwRf+IqcrQFYlktyNfj0objTg5A4DIj1NlgsG8 WjKVoHvGYJo3Do5kK2mq2L1fJpXWXKWSckxS+UStVUnGkFFh08cNm25FxUBu4PF9 TE0PUAraUGThhxLOn3zrnUbZIUpcKYCWnBvXROxJswtGCxhAD9kZfYUxT4jhJtY/ XSXzUIhYimlCsqwGaytiCDz6wb22bubCcLy9FveWrfWtC5CxStDgLonnL1lcnQxt 8o6/MiK0GmW2QR/o+e6zEUgOCqhzZHzMYBDA7ec8mERLO7TQM6WxVmtEUSXGNWOM N5Mi5NnTHjnOr/0ipi6v7jyO8yW7a10fEFKuzpZFiOJp1tnObWOa42+zM0V/dcH0 bZq/PPzscNNZK4w4ZviypvCUpDEIfE+Hqllk04qWMiDpL4sR2wM= =+WL7 -----END PGP SIGNATURE----- --oOK2TDWfVhBmsKm+-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 12:58:56 2024 Received: (at 70985) by debbugs.gnu.org; 7 Jul 2024 16:58:56 +0000 Received: from localhost ([127.0.0.1]:49055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVDz-0004sW-VT for submit@debbugs.gnu.org; Sun, 07 Jul 2024 12:58:56 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:61685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVDy-0004sI-P9 for 70985@debbugs.gnu.org; Sun, 07 Jul 2024 12:58:55 -0400 Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-79f02fe11aeso91914985a.2 for <70985@debbugs.gnu.org>; Sun, 07 Jul 2024 09:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720371465; x=1720976265; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=9aywCFLh8hHhmkWjevHtVbpjp8KAytbWhbHyMUA/Sdo=; b=ff6uCHtU2bRubIxPMaUpdeOanloqcTsXYGnmWz25AUImsx7iilQ9ksliAfMUafVcEG 0MXATIU19KRYsktzpz/BFxE7AqbhXGiWrQD1e3f8RqSGLJnE+aXzYqenKpEMt9lDGPNc WoU2OhPnAOIzgC0WwH/0Yo+hb6+zlVDz3XlAF4IR5zJME5gJAecB36+2yVXwyji3PnkY cORisbkdEvitbnClx6TVE3O1ke7VWUs41so5kRp3BUYptP77oRdCIcUVGteXKQXv9Nrw xBXLh4KwtOo6b9FO2hi0/g3Dhx/BtBP4WfXZhsP+w4t5+RRXb37Ztr/PNlsHDsJAzGY2 AcOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720371465; x=1720976265; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9aywCFLh8hHhmkWjevHtVbpjp8KAytbWhbHyMUA/Sdo=; b=vMnmpCO3kIVrySUUi1TdXVPB0U9GqyitS/w71NPnTiR2/1PAoa1gRC90TSwHVYwI3u ZSuUO36coUdZCxE1WpJCcQCrNu9o7NRXCBrgOyWzXqcHVwYXABGzqpaS6EYq7Qy9OslI H/o8i33Or3R1uMHzw1TxYJEcH4ZFEkG8ie6syQHcLAXfu4woX770D7JQywEuD73Pu9Ox F++gcDQciLwO1eXNISlQnZ1q3C7bKif55VIzDS1kpZeNNimOF3rQNN9W8H68dKwk2xnw Tr5Xn25wus2YPFpIbFII+QfvL8wLI6d7P5KB7q+CP64DyfzmslEMRYBxlOWWtK5b6uci uIUg== X-Gm-Message-State: AOJu0Yx64AO0KdYL+srTGQp7zTF9gnzCvtMU+rxVciFeZC0FmF30JP5S t3IR0AHKtqo9REvVJURL3rhPyAT9UJ+8Sjg5TKKwCL67RSZimXwe X-Google-Smtp-Source: AGHT+IEC8lIqL23yzGa72XPEowEqZOeqnSYqhh5mCn8RNt9NatPpR0XP7oyte46+i9vIT61DeK+e5Q== X-Received: by 2002:a05:620a:530f:b0:79f:8ba:aea9 with SMTP id af79cd13be357-79f08baaffdmr292334885a.5.1720371464744; Sun, 07 Jul 2024 09:57:44 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79d6932ff9csm980974285a.133.2024.07.07.09.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 09:57:44 -0700 (PDT) Date: Sun, 7 Jul 2024 19:57:43 +0300 From: Efraim Flashner To: Christopher Baines Subject: Re: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Message-ID: Mail-Followup-To: Efraim Flashner , Christopher Baines , 70985@debbugs.gnu.org References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Zl6Et+AnZxZ/Ba7K" Content-Disposition: inline In-Reply-To: <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --Zl6Et+AnZxZ/Ba7K Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 05, 2024 at 06:06:02PM +0200, Christopher Baines wrote: > * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against > cross-libc returning #f. >=20 > Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 > --- > gnu/packages/rust.scm | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index a385344473..f1de34b277 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -73,7 +73,9 @@ (define-module (gnu packages rust) > #:use-module (ice-9 match) > #:use-module (ice-9 optargs) > #:use-module (srfi srfi-1) > - #:use-module (srfi srfi-26)) > + #:use-module (srfi srfi-26) > + #:use-module (srfi srfi-34) > + #:use-module (srfi srfi-35)) > =20 > ;; This is the hash for the empty file, and the reason it's relevant is = not > ;; the most obvious. > @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation > (modify-inputs (package-native-inputs base-rust) > (prepend (cross-gcc target > #:libc (cross-libc target)) > - (cross-libc target) > + (or (cross-libc target) ; could be #f > + (raise (condition > + (&package-unsupported-targe= t-error > + (package (libc-for-target = target)) > + (target target))))) > (cross-binutils target))))) > (properties > `((hidden? . #t) > --=20 > 2.45.2 This will probably work: (native-inputs `((,(string-append "gcc-cross-" target) ,(cross-gcc target #:libc (cross-libc tar= get))) ,(when (false-if-exception (cross-libc target)) `(,(string-append "glibc-cross-" target) ,(cross-libc target))) (,(string-append "binutils-cross-" target) ,(cross-binutils target)) ,(when (target-mingw? target) (if (string=3D? "i686-w64-mingw32" target) `("mingw-w64-i686-winpthreads" ,mingw-w64-i686-winpthreads) `("mingw-w64-x86_64-winpthreads" ,mingw-w64-x86_64-winpthreads))) ,@(package-native-inputs base-rust))) --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --Zl6Et+AnZxZ/Ba7K Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaKyQEACgkQQarn3Mo9 g1H4gw//f7HneYmFBzgOhwuy9IrmMO2uGg5N1ULmIOih+hPns9oglOearlIdR5Mo uNEwsEsP8LlC0/8YBAsgaH3q/Q6rE1tEglV36lmdm2YE+ZDDFfPPQJqVxgtdX7lP elX3HWppu/q4PUsmtdgd/+qS1QCcaYSWan+e1ZLNMefJzm4/+6FOh+5E0MX0DjrJ A7vdrH2c1BPqEYmIxv+ipu2okeBMA0FpatUsYDqk6bobxNXuUUzr2AAZd7ErkbE5 xHc8hgyV0/U2Nv+jrAeNP+cbmBFqSmyl+sHfKOeS73nhvD2pujxtgy4/jY1Bv6qG uHThuL+xVrOF9OgZtFaoOe3UJmvhhmYOkCy4dUuy0wnZ7Ez9H7SShWS1MHA+fWuq em513Pfm3SzaK/13RwNditDmkMd3bywwwQfW9lY4Ecvb7SM0aFAoI5W7BVfVxc9q JKH8yARv50dPv2429uhvkQNYb4/IO5IbnJQ7ZzJNjaisX+ovhss1VP4h9cpDUbN6 jo4ps6whYa5s3Hgs9K5BFYAB24M/V5BOmXR3DGuU832zOleoVBBitPW4H9YTwEyr 9t7NYFTLqOBGcixsa4qmg7npFQ8j4PpGmwLdPhJunVCzA/q2oe4scPm9YPj+JYjU Ju3GhI6+O2gLrmZz9lmSfF1ROklAkCvJGtTCc7X0CfxaStBGba0= =eUOG -----END PGP SIGNATURE----- --Zl6Et+AnZxZ/Ba7K-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 05:25:50 2024 Received: (at 70985) by debbugs.gnu.org; 9 Jul 2024 09:25:50 +0000 Received: from localhost ([127.0.0.1]:52155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR76c-0007be-0l for submit@debbugs.gnu.org; Tue, 09 Jul 2024 05:25:50 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sR76Y-0007bV-H6 for 70985@debbugs.gnu.org; Tue, 09 Jul 2024 05:25:48 -0400 Received: from localhost (unknown [89.207.175.27]) by mira.cbaines.net (Postfix) with ESMTPSA id F1B2227BBE2; Tue, 9 Jul 2024 10:25:08 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a35962b0; Tue, 9 Jul 2024 09:25:07 +0000 (UTC) From: Christopher Baines To: Efraim Flashner Subject: Re: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. In-Reply-To: (Efraim Flashner's message of "Sun, 7 Jul 2024 19:57:43 +0300") References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Tue, 09 Jul 2024 11:25:04 +0200 Message-ID: <87zfqq9atr.fsf@cbaines.net> 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: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Efraim Flashner writes: > On Fri, Jul 05, 2024 at 06:06:02PM +0200, Christopher Baines wrote: >> * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against >> cross-libc returning #f. >>=20 >> Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 >> --- >> gnu/packages/rust.scm | 10 ++++++++-- >> 1 file changed, 8 insertions(+), 2 deletions(-) >>=20 >> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm >> index a385344473..f1de34b277 100644 >> --- a/gnu/packages/rust.scm >> +++ b/gnu/packages/rust.scm >> @@ -73,7 +73,9 @@ (define-module (gnu packages rust) >> #:use-module (ice-9 match) >> #:use-module (ice-9 optargs) >> #:use-module (srfi srfi-1) >> - #:use-module (srfi srfi-26)) >> + #:use-module (srfi srfi-26) >> + #:use-module (srfi srfi-34) >> + #:use-module (srfi srfi-35)) >>=20=20 >> ;; This is the hash for the empty file, and the reason it's relevant is= not >> ;; the most obvious. >> @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation >> (modify-inputs (package-native-inputs base-rust) >> (prepend (cross-gcc target >> #:libc (cross-libc target)) >> - (cross-libc target) >> + (or (cross-libc target) ; could be #f >> + (raise (condition >> + (&package-unsupported-targ= et-error >> + (package (libc-for-target= target)) >> + (target target))))) >> (cross-binutils target))))) >> (properties >> `((hidden? . #t) >> --=20 >> 2.45.2 > > This will probably work: > > (native-inputs > `((,(string-append "gcc-cross-" target) ,(cross-gcc target > #:libc (cross-libc t= arget))) > ,(when (false-if-exception (cross-libc target)) > `(,(string-append "glibc-cross-" target) ,(cross-libc target))) > (,(string-append "binutils-cross-" target) ,(cross-binutils target)) > ,(when (target-mingw? target) > (if (string=3D? "i686-w64-mingw32" target) > `("mingw-w64-i686-winpthreads" ,mingw-w64-i686-winpthreads) > `("mingw-w64-x86_64-winpthreads" ,mingw-w64-x86_64-winpthreads)= )) > ,@(package-native-inputs base-rust))) Thanks for taking a look. In the latest patches cross-libc isn't changing to raise an exception (as that ended up being too complicated), so I'm not sure the false-if-exception is going to work. I'd also maybe stick with modify-inputs, as at least that avoids the older inputs style. If I've followed your first email correctly, are you thinking of something like this? (native-inputs (if (target-mingw? target) (modify-inputs (package-native-inputs base-rust) (prepend (cross-gcc target #:libc (cross-libc target)) (cross-binutils target) (if (string=3D? "i686-w64-mingw32" target) mingw-w64-i686-winpthreads mingw-w64-x86_64-winpthreads))) (modify-inputs (or (and=3D> (cross-libc target) (lambda (x-libc) (modify-inputs (package-native-inputs base-rust) (prepend x-libc)))) (package-native-inputs base-rust)) (prepend (cross-gcc target #:libc (cross-libc target)) (cross-binutils target))))) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmaNAfBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfA0w/+KryaTEjkoqd0m2JxgaqddlGDOAlOHRrj dAHBE6VlG95UQWje1ldZXqt+Hc/SARcYptaPxJx8mrFPu46LtCpoYnd0w46HOKmR Y7q09JNt8mljokuXgm9bxDVVKsecMQVpJB9l90Z7JDr+RB/Ye1qayIykl6kQzQfX JeX5nhzjCh1gJJrlx4fibpMK3QQtIUpYpl01mXEp1mb3B7VU2kNd8NzCKuyL+haX pjzz4Bplkd4v+uCml3vFLf6+X7Hd6Y7JoYMtiahYaDSPY4O/mSMBkj3dDaJ5oqlI 2+qFphB/d8wYvHLJlra26wKhauqkXzJ/FxvqD+/WU8dySiiq7pLEtwjmkqKS5R8n L7oXERX60x9WTSdCsiGC+fDbFd12t9i6AqxsjQESuiPC1ynEjDoCZXixj0oSIWSa mrzBfG8dPE+uS8XSokV4WYQ6AZZ9CrDFM9GmjHx7m6DeB8w3hCWBGIphd3RaHJ0u YMcCo8p5IIaJI77GOyOOrSu9ET5yY5lsykEi5M8HFVCAVjNgCEivc1ZchtErVhWM ZYSAGqaDOm+J+Z9XBi/6t698dVc+MrYhBK3sg0OwIeuXWatKDAp+q7ttJqWuZbQr le1csf/2UUB5wBmuTfb6Q4ypmzxRmD5pXngME/QRbnws+559nWNUPtvcvgWw7sD3 22YxSNnDvjQ= =LkWP -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 11:22:22 2024 Received: (at 70985) by debbugs.gnu.org; 9 Jul 2024 15:22:22 +0000 Received: from localhost ([127.0.0.1]:53903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRCfd-000681-Ev for submit@debbugs.gnu.org; Tue, 09 Jul 2024 11:22:21 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:42187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRCfb-00067m-8O for 70985@debbugs.gnu.org; Tue, 09 Jul 2024 11:22:20 -0400 Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-447e2d719afso19437361cf.0 for <70985@debbugs.gnu.org>; Tue, 09 Jul 2024 08:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720538468; x=1721143268; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=K7Jrbs0wSU9PZM8TNYU0yzqqP42bVqpt4u7MhJAfFps=; b=Hid/24Vhege2wLRA1QtQolNuvNS1Mb0pMyrbFN8MdYA6pmO/Y2VXE5Apidf7ioRVlZ w+OGKvG6pgvThoRRwQhihGTu/ekdyeXoOopDQFxim2N0EosFwsPOEW8UgGvXdO3DkMT9 eCJTWBabyBDSTmK7FKoo8BVHj4LjIdZLHtgasI+DqE5Pnj5E7Cf0L1awaar/9FA0EcFs WIEChMli/w0YLk4xplhlpkKm90PO7YL521VJdb5o2MHRocF0TFUwAhXmSNDgNtGPAXP6 gD/NG5Q8h7BOBrHnvTY6+ntE8VpvfUAscZJr4TWmshuuUwgIDrTHJ8uMYJDq/U1AnHsz Tpiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720538468; x=1721143268; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=K7Jrbs0wSU9PZM8TNYU0yzqqP42bVqpt4u7MhJAfFps=; b=qzhdrrLZJTDod8rJzxaJIlW8YaxJum1tCxe7YwiPKjJDJTWywQt4KIy9KPUzFpGYna 7fucikcUOAGc1SNSWf+IU7KrIhTfSgccjwXUXh5eqXKdFfMUUunswNOEecyRu9ZjNKCY k7G3+JTtW1e/6VIEhv98p2uvceRCbKQProqXy1LgenVOn8ydHaBBuv9xF+3xho11/Qyp YkIEi5XzkNPNz42aQBvfaE3EGuvWaxF+RT8YPj/dnf7te3tY1DedI/AgWIv2R7WvpgPu LgNl1pdd8n+Z4CjMC60KBNsMYdkadqV+VuEZS56gbSEzJ9Q6bUgVOBt+03uWKz8xuhwG risA== X-Gm-Message-State: AOJu0YwYOQT4meaDsO7+mlMommwoZG6HaNmtdSiS60teoCn7lgeoU7r+ A3FquG/LJTVyEz1bsHC3tNv5RDIz6L2HDNMs3y3gkTr5K1bmM4Jv X-Google-Smtp-Source: AGHT+IHe/T8H5NsLalk1DEPUzOr7W9RnLHKysfjtR1NiPg3HLNpuqXqUHHSx0xR4Z/fZ0L4vSW2heg== X-Received: by 2002:ac8:530b:0:b0:447:e532:b36b with SMTP id d75a77b69052e-447fc42160dmr37156321cf.21.1720538467627; Tue, 09 Jul 2024 08:21:07 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f190b7a60sm104398285a.134.2024.07.09.08.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 08:21:07 -0700 (PDT) Date: Tue, 9 Jul 2024 18:21:05 +0300 From: Efraim Flashner To: Christopher Baines Subject: Re: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Message-ID: Mail-Followup-To: Efraim Flashner , Christopher Baines , 70985@debbugs.gnu.org References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> <87zfqq9atr.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="CbG5KfAan0mHUEKf" Content-Disposition: inline In-Reply-To: <87zfqq9atr.fsf@cbaines.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --CbG5KfAan0mHUEKf Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 09, 2024 at 11:25:04AM +0200, Christopher Baines wrote: > Efraim Flashner writes: >=20 > > On Fri, Jul 05, 2024 at 06:06:02PM +0200, Christopher Baines wrote: > >> * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard agai= nst > >> cross-libc returning #f. > >>=20 > >> Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 > >> --- > >> gnu/packages/rust.scm | 10 ++++++++-- > >> 1 file changed, 8 insertions(+), 2 deletions(-) > >>=20 > >> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > >> index a385344473..f1de34b277 100644 > >> --- a/gnu/packages/rust.scm > >> +++ b/gnu/packages/rust.scm > >> @@ -73,7 +73,9 @@ (define-module (gnu packages rust) > >> #:use-module (ice-9 match) > >> #:use-module (ice-9 optargs) > >> #:use-module (srfi srfi-1) > >> - #:use-module (srfi srfi-26)) > >> + #:use-module (srfi srfi-26) > >> + #:use-module (srfi srfi-34) > >> + #:use-module (srfi srfi-35)) > >> =20 > >> ;; This is the hash for the empty file, and the reason it's relevant = is not > >> ;; the most obvious. > >> @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation > >> (modify-inputs (package-native-inputs base-rust) > >> (prepend (cross-gcc target > >> #:libc (cross-libc target= )) > >> - (cross-libc target) > >> + (or (cross-libc target) ; could be #f > >> + (raise (condition > >> + (&package-unsupported-ta= rget-error > >> + (package (libc-for-targ= et target)) > >> + (target target))))) > >> (cross-binutils target))))) > >> (properties > >> `((hidden? . #t) > >> --=20 > >> 2.45.2 > > > > This will probably work: > > > > (native-inputs > > `((,(string-append "gcc-cross-" target) ,(cross-gcc target > > #:libc (cross-libc= target))) > > ,(when (false-if-exception (cross-libc target)) > > `(,(string-append "glibc-cross-" target) ,(cross-libc target)= )) > > (,(string-append "binutils-cross-" target) ,(cross-binutils target)) > > ,(when (target-mingw? target) > > (if (string=3D? "i686-w64-mingw32" target) > > `("mingw-w64-i686-winpthreads" ,mingw-w64-i686-winpthreads) > > `("mingw-w64-x86_64-winpthreads" ,mingw-w64-x86_64-winpthread= s))) > > ,@(package-native-inputs base-rust))) >=20 > Thanks for taking a look. In the latest patches cross-libc isn't > changing to raise an exception (as that ended up being too complicated), > so I'm not sure the false-if-exception is going to work. false-if-exception should work. We use it a couple of times in golang packaging to skip the tests if we're building with gccgo. (unless ;; The tests fail when run with gccgo. (false-if-exception (search-input-file inputs "/bin/gccgo")) (apply (assoc-ref %standard-phases 'check) args))))))) > I'd also maybe stick with modify-inputs, as at least that avoids the > older inputs style. >=20 > If I've followed your first email correctly, are you thinking of > something like this? >=20 > (native-inputs > (if (target-mingw? target) > (modify-inputs (package-native-inputs base-rust) > (prepend (cross-gcc target > #:libc (cross-libc target)) > (cross-binutils target) > (if (string=3D? "i686-w64-mingw32" targe= t) > mingw-w64-i686-winpthreads > mingw-w64-x86_64-winpthreads))) > (modify-inputs (or (and=3D> (cross-libc target) > (lambda (x-libc) > (modify-inputs > (package-native-inputs base-rust) > (prepend x-libc)))) > (package-native-inputs base-rust)) > (prepend (cross-gcc target > #:libc (cross-libc target)) > (cross-binutils target))))) Thanks, I hate it :) That said, if it works then it's fine. (I lose my confidence from (cross-libc target) getting renamed to x-libc) I played around with it a bit more. The problem is that we can only logic our way around before modify-inputs or inside prepend/append/delete, so options are a bit limited as to what we can do. I came up with the following, which I think should also work: (native-inputs (modify-inputs (package-native-inputs base-rust) (prepend (cross-binutils target)) (prepend (cond ((and (target-mingw? target) (target-x86-32? target)) mingw-w64-i686-winpthreads) ((and (target-mingw? target) (target-x86-64? target)) mingw-w64-x86_64-winpthreads) ((or (target-linux? target) (target-hurd? target)) (cross-libc target)) ;; We need something, and duplicating cross-binutils ;; doesn't cause any problems. (#t (cross-binutils target)))) (prepend (cross-gcc target #:libc (cross-libc target))))) I don't like the '#t' branch of the cond, but it doesn't seem to break anything. And we're explicit about who gets cross-libc. I would like something like the following to work, but some of the inputs get lost (native-inputs (modify-inputs (package-native-inputs base-rust) (prepend (cond ((and (target-mingw? target) (target-x86-32? target)) (cross-gcc target #:libc (cross-libc target)) mingw-w64-i686-winpthreads (cross-binutils target)) ((and (target-mingw? target) (target-x86-64? target)) (cross-gcc target #:libc (cross-libc target)) mingw-w64-x86_64-winpthreads (cross-binutils target)) ((or (target-linux? target) (target-hurd? target)) (cross-gcc target #:libc (cross-libc target)) (cross-libc target) (cross-binutils target)) (else (cross-gcc target #:libc (cross-libc target)) (cross-binutils target)))))) --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --CbG5KfAan0mHUEKf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaNVVcACgkQQarn3Mo9 g1FelhAAuaFjSYlTyOfHjTwrp1mWT+xSiTxnfwsZEGw68ks0OGrI4X1wslazOBMp X9zlImVGJwmFSAASzmcEnLYnYbUn5dDMzUPw4qqbLatEFxBoayePXXbj+doFfb9S hP5JlZn2JFUuzsrvDtIgFNbQ9kKPu6RPKq2nLcZrh3+4Aq2TbRXEzUeJP1zd5oWS t5N2L6daYkdZ0k+erIXaaT15MyFQN5ZE3/HAkg91WCgwDlyy3h6an2YvmiXhGX6R W2ovVBr7cIIXEi6UaZbKcL9rq+WTTypm7xISV2gLht5rChYmMfN2Hs+ki8TsIs/F xSkmeEpFoJOK6rvWUwWjVcPwyW7ZFaFCsbRg9XiSp6lCgpTVnXA3BdaszXg4kHIi PY6tFXq7itIRLOfCi+Q52OpJWgIk1IMhNHMO1gEpNyF96BkT9OTYtVJgjIhqXZz+ BCbe7bCcu3Y/4vYCr2yQTxATYUEUivmkweTbIEvmeBKwLfnBI0cwLYqFus15ebjv APlmO6Z0dlVciAYImSMjOC97KcT3ZA/hABR4rsCQjv/I1y5tUG9ZcNlIDeoGRBuX kI7iEZ/cNbZ745hw1CLK+KLFnaVsQtBUs3AafCIGe9vL9BBIRRzu3qwwcTnrvkRW xOb430PNsm1ksJzUu10b/OEzI3dNF0vduuHzCC8vIyy9XZi4zkw= =EJ7r -----END PGP SIGNATURE----- --CbG5KfAan0mHUEKf-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:41:52 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:41:52 +0000 Received: from localhost ([127.0.0.1]:53508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGX2-0001Ct-HS for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:52 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGWy-0001CJ-MG for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:50 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id 4F37227BBEC for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 14:41:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2f8ca744 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 13:41:46 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v3 5/6] gnu: rust: Guard against unsupported rust targets. Date: Fri, 12 Jul 2024 14:41:44 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) As cross-libc may return #f in this case, and the config.toml file construction will also fail if the platform rust-target is #f.. * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against unsupported rust targets. Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 --- gnu/packages/rust.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a385344473..8119f4560a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -73,7 +73,9 @@ (define-module (gnu packages rust) #:use-module (ice-9 match) #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) ;; This is the hash for the empty file, and the reason it's relevant is not ;; the most obvious. @@ -1309,6 +1311,13 @@ (define*-public (make-rust-sysroot target) (define make-rust-sysroot/implementation (mlambda (target base-rust) + (unless (platform-rust-target (lookup-platform-by-target target)) + (raise + (condition + (&package-unsupported-target-error + (package base-rust) + (target target))))) + (package (inherit base-rust) (name (string-append "rust-sysroot-for-" target)) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:41:53 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:41:53 +0000 Received: from localhost ([127.0.0.1]:53510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGX2-0001Cw-Qr for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:53 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGWy-0001CL-MD for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:50 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id D640D27BBE2 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 14:41:46 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 324d8d01 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 13:41:46 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v3 1/6] guix: packages: Add new &package-unsupported-target-error. Date: Fri, 12 Jul 2024 14:41:40 +0100 Message-ID: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Some packages don't support cross building to specific targets, so add a error type to signal this. * guix/packages.scm (&package-unsupported-target-error): New condition type. [package-unsupported-target-error? package-unsupported-target-error-target): New procedures. * guix/ui.scm (call-with-error-handling): Handle this new condition type. Change-Id: Ib47813399e04b20d616a95f545b6aabe25736e92 --- guix/packages.scm | 7 +++++++ guix/ui.scm | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index f3a9a61785..e793714f2e 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -173,6 +173,9 @@ (define-module (guix packages) package-error-invalid-input &package-cross-build-system-error package-cross-build-system-error? + &package-unsupported-target-error + package-unsupported-target-error? + package-unsupported-target-error-target package->bag bag->derivation @@ -850,6 +853,10 @@ (define-condition-type &package-cyclic-dependency-error &package-error (define-condition-type &package-cross-build-system-error &package-error package-cross-build-system-error?) +(define-condition-type &package-unsupported-target-error &package-error + package-unsupported-target-error? + (target package-unsupported-target-error-target)) + (define* (package-full-name package #:optional (delimiter "@")) "Return the full name of PACKAGE--i.e., `NAME@VERSION'. By specifying DELIMITER (a string), you can customize what will appear between the name and diff --git a/guix/ui.scm b/guix/ui.scm index d82fa533cc..0bb1b3b3ba 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -756,6 +756,13 @@ (define (call-with-error-handling thunk) (location->string loc) (package-full-name package) (build-system-name system)))) + ((package-unsupported-target-error? c) + (let* ((package (package-error-package c)) + (loc (package-location package))) + (leave (G_ "~a: ~a: does not support target `~a'~%") + (location->string loc) + (package-full-name package) + (package-unsupported-target-error-target c)))) ((gexp-input-error? c) (let ((input (gexp-error-invalid-input c))) (leave (G_ "~s: invalid G-expression input~%") base-commit: d11912ac254d1dd8f5d1f5d67c59d0f6d6b68006 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:41:53 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:41:53 +0000 Received: from localhost ([127.0.0.1]:53512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGX3-0001D3-9r for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:53 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGWy-0001CI-MC for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:51 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id 3280027BBEB for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 14:41:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e384ca53 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 13:41:46 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v3 4/6] build-system: meson: Use a more specific exception. Date: Fri, 12 Jul 2024 14:41:43 +0100 Message-ID: <0739930bf7312cde64a1d4f6268b7d332bfa8f5f.1720791705.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is handled by (guix ui). * guix/build-system/meson.scm (make-machine-alist): Use a more specific exception. Change-Id: I842ba63739fdefe04460e938c7bc8aa54ea57b96 --- guix/build-system/meson.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index bf9ca15ecc..04d2241c79 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -30,6 +30,8 @@ (define-module (guix build-system meson) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix packages) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (%meson-build-system-modules meson-build-system make-cross-file)) @@ -50,7 +52,12 @@ (define (make-machine-alist triplet) ((target-linux? triplet) "linux") ((target-mingw? triplet) "windows") ((target-avr? triplet) "none") - (#t (error "meson: unknown operating system")))) + (else + (raise + (condition + (&unsupported-cross-compilation-target-error + (build-system meson-build-system) + (target triplet))))))) (cpu_family . ,(cond ((target-x86-32? triplet) "x86") ((target-x86-64? triplet) "x86_64") ((target-arm32? triplet) "arm") @@ -62,7 +69,12 @@ (define (make-machine-alist triplet) "ppc64" "ppc")) ((target-riscv64? triplet) "riscv64") - (#t (error "meson: unknown architecture")))) + (else + (raise + (condition + (&unsupported-cross-compilation-target-error + (build-system meson-build-system) + (target triplet))))))) (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 (substring triplet 0 4)) ((target-x86-64? triplet) "x86_64") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:41:54 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:41:54 +0000 Received: from localhost ([127.0.0.1]:53514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGX3-0001DA-LB for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:53 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGWy-0001CM-OW for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:51 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id 02C7427BBE9 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 14:41:46 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4d6ee562 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 13:41:46 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v3 2/6] gnu: tls: Raise conditions from target->openssl-target. Date: Fri, 12 Jul 2024 14:41:41 +0100 Message-ID: <4d8b7bd0e26cfda50e1f772ae9541b97d1c3c128.1720791705.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Rather than rasising generic errors. * gnu/packages/tls.scm (target->openssl-target): Raise conditions rather than generic errors. (openssl-1.1): Call target->openssl-target with the package. Change-Id: I13c63328cdf6bc177b20879805246ad94ff2665b --- gnu/packages/tls.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 760b917768..fdc003731d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -84,7 +84,9 @@ (define-module (gnu packages tls) #:use-module (gnu packages time) #:use-module (gnu packages version-control) #:use-module (gnu packages base) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) (define-public libtasn1 (package @@ -390,7 +392,7 @@ (define-public guile2.2-gnutls (modify-inputs (package-inputs guile-gnutls) (replace "guile" guile-2.2))))) -(define (target->openssl-target target) +(define (target->openssl-target pkg target) "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling OpenSSL for TARGET." ;; Keep this code outside the build code, @@ -411,7 +413,10 @@ (define (target->openssl-target target) ((target-linux? target) "linux") (else - (error "unsupported openssl target kernel")))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target))))))) (arch (cond ((target-x86-32? target) @@ -438,7 +443,10 @@ (define (target->openssl-target target) ((target-64bit? target) "generic64") (else - (error "unsupported openssl target architecture"))))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target)))))))) (string-append kernel "-" arch)))) (define-public openssl-1.1 @@ -488,6 +496,7 @@ (define-public openssl-1.1 (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" #$(target->openssl-target + this-package (%current-target-system)))))) #~()) #$@(if (target-hurd?) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:41:54 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:41:54 +0000 Received: from localhost ([127.0.0.1]:53516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGX4-0001DI-0P for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:54 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGWy-0001CN-PR for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:41:51 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id 13D0227BBEA for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 14:41:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 3822cd74 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 13:41:46 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v3 3/6] guix: packages: Add &unsupported-cross-compilation-target-error. Date: Fri, 12 Jul 2024 14:41:42 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/packages.scm (&unsupported-cross-compilation-target-error): New variable. * guix/ui.scm (call-with-error-handling): Handle this new condition type. Change-Id: I9e7782ee4799b5fecb3c890a75008c35c003f55d --- guix/packages.scm | 10 ++++++++++ guix/ui.scm | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index e793714f2e..c953db9a03 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -160,6 +160,11 @@ (define-module (guix packages) %cuirass-supported-systems supported-package? + &unsupported-cross-compilation-target-error + unsupported-cross-compilation-target-error? + unsupported-cross-compilation-target-error-build-system + unsupported-cross-compilation-target-error-target + &package-error package-error? package-error-package @@ -834,6 +839,11 @@ (define-syntax-rule (this-package-native-input name) ;; Error conditions. +(define-condition-type &unsupported-cross-compilation-target-error &error + unsupported-cross-compilation-target-error? + (build-system unsupported-cross-compilation-target-error-build-system) + (target unsupported-cross-compilation-target-error-target)) + (define-condition-type &package-error &error package-error? (package package-error-package)) diff --git a/guix/ui.scm b/guix/ui.scm index 0bb1b3b3ba..9db6f6e9d7 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -763,6 +763,13 @@ (define (call-with-error-handling thunk) (location->string loc) (package-full-name package) (package-unsupported-target-error-target c)))) + ((unsupported-cross-compilation-target-error? c) + (let ((build-system + (unsupported-cross-compilation-target-error-build-system c)) + (target (unsupported-cross-compilation-target-error-target c))) + (leave (G_ "the `~a' build system: does not support target `~a'~%") + (build-system-name build-system) + target))) ((gexp-input-error? c) (let ((input (gexp-error-invalid-input c))) (leave (G_ "~s: invalid G-expression input~%") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:42:22 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:42:22 +0000 Received: from localhost ([127.0.0.1]:53534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGXW-0001F1-D1 for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:42:22 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGXU-0001Eu-Uf for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:42:21 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id 5FF9A27BBED for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 14:41:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 68dd0ace for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 13:41:46 +0000 (UTC) From: Christopher Baines To: 70985@debbugs.gnu.org Subject: [PATCH v3 6/6] build-system: go: Properly handle when a target is unsupported. Date: Fri, 12 Jul 2024 14:41:45 +0100 Message-ID: <839192cfed0df9b57cb43af2bed29c6e022b850a.1720791705.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70985 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build-system/go.scm (go-target): Properly handle when a target is unsupported. Change-Id: Ibc0becb8eb0a712d21116112c44e2bbbb707ddf4 --- guix/build-system/go.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 0934fded07..fc53b3be9f 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -33,6 +33,8 @@ (define-module (guix build-system go) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:export (%go-build-system-modules go-build go-build-system @@ -101,7 +103,13 @@ (define (go-target target) (_ arch)) (match os ((or "mingw32" "cygwin") "windows") - (_ os)))))) + (_ os)))) + (_ + (raise + (condition + (&unsupported-cross-compilation-target-error + (build-system go-build-system) + (target target))))))) (define %go-build-system-modules ;; Build-side modules imported and used by default. -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 09:56:42 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 13:56:42 +0000 Received: from localhost ([127.0.0.1]:54548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGlN-0001pL-Vk for submit@debbugs.gnu.org; Fri, 12 Jul 2024 09:56:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSGlL-0001pF-Tz for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 09:56:40 -0400 Received: from localhost (unknown [213.31.211.195]) by mira.cbaines.net (Postfix) with ESMTPSA id C77BC27BBE2; Fri, 12 Jul 2024 14:56:07 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c98b9daf; Fri, 12 Jul 2024 13:56:06 +0000 (UTC) From: Christopher Baines To: Efraim Flashner Subject: Re: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. In-Reply-To: (Efraim Flashner's message of "Tue, 9 Jul 2024 18:21:05 +0300") References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> <87zfqq9atr.fsf@cbaines.net> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Fri, 12 Jul 2024 14:56:04 +0100 Message-ID: <87msmm7lzf.fsf@cbaines.net> 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: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Efraim Flashner writes: >> I'd also maybe stick with modify-inputs, as at least that avoids the >> older inputs style. >>=20 >> If I've followed your first email correctly, are you thinking of >> something like this? >>=20 >> (native-inputs >> (if (target-mingw? target) >> (modify-inputs (package-native-inputs base-rust) >> (prepend (cross-gcc target >> #:libc (cross-libc target)) >> (cross-binutils target) >> (if (string=3D? "i686-w64-mingw32" targ= et) >> mingw-w64-i686-winpthreads >> mingw-w64-x86_64-winpthreads))) >> (modify-inputs (or (and=3D> (cross-libc target) >> (lambda (x-libc) >> (modify-inputs >> (package-native-inputs base-rus= t) >> (prepend x-libc)))) >> (package-native-inputs base-rust)) >> (prepend (cross-gcc target >> #:libc (cross-libc target)) >> (cross-binutils target))))) > > Thanks, I hate it :) That said, if it works then it's fine. (I lose my > confidence from (cross-libc target) getting renamed to x-libc) > > I played around with it a bit more. The problem is that we can only > logic our way around before modify-inputs or inside > prepend/append/delete, so options are a bit limited as to what we can > do. I came up with the following, which I think should also work: > > (native-inputs > (modify-inputs (package-native-inputs base-rust) > (prepend (cross-binutils target)) > (prepend > (cond ((and (target-mingw? target) > (target-x86-32? target)) > mingw-w64-i686-winpthreads) > ((and (target-mingw? target) > (target-x86-64? target)) > mingw-w64-x86_64-winpthreads) > ((or (target-linux? target) > (target-hurd? target)) > (cross-libc target)) > ;; We need something, and duplicating cross-binutils > ;; doesn't cause any problems. > (#t (cross-binutils target)))) > (prepend (cross-gcc target > #:libc (cross-libc target))))) I looked at this further and actually tried building the derivations for different targets, and realised that there needs to be a platform-rust-target set for it to work. So maybe we don't need to bother with the inputs here and can just add a guard at the top, e.g. (define make-rust-sysroot/implementation (mlambda (target base-rust) + (unless (platform-rust-target (lookup-platform-by-target target)) + (raise + (condition + (&package-unsupported-target-error + (package base-rust) + (target target))))) + I've sent a new patch series to this effect. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmaRNfRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfXJA//eECVY4KfonaYw6rMT6K7N2he/Vzdthfn WtILbMmfScaVWbLEwtEwbOKyZbA6XNdYTvKFV27d92I3VSzEVuy75x2h//bL8sYy RlU1T9FyjzkvUCzemUE463wbnQVenMhOo1rgzRCNFpDNfMQUGnJBZ5RxMfK9zq3X Z47lf14A5Bk1wg0y9SLzA4w4j4HNhTkfjp/CF9xBe2XkCIAk87lFrLOelOvht3p3 CI5Lhbb5+E2UD0RfX6QrUsJMMG+YYUZ0s1msOr37vo//8eXRBnOJ4jF301y8wr6u TYZWKK7lB7gARrLA9YXEPP9+8UO2t0smNEPy/3kwtoSoISqInQE8dSXSE4RU4PKl FC2YDjXcpm1gu65DZz94kqGLhKTsKLJ341Rq6gSSgnmJTsctMOqkO8xYUMYrBHGN hUjz96CL40lTxP6huhcNkB2KVAw4ZxEu499Ti73x+osb9d2dES8pvNLXMW/vKErH BpC6wbpm4q5KvI1k57NLNZ7JZbgRb8jkwSmrgu1X5GJVrMwg8QJoAkWPk1CKg+3k BWx4knblQ5uZkWY3s8HzYx4t2OsJ0mGLAiNF6r5A8GKW1YlqEwL8hJBY2rIXfKRJ Hf/S4xfx2/GSD+RhGpUEsIwqZsuB2QuTW+p3BKkLVTxX8NLQ3LcgrP9F85bcMlps jYfPC4qh86Y= =S+In -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 10:29:10 2024 Received: (at 70985) by debbugs.gnu.org; 12 Jul 2024 14:29:10 +0000 Received: from localhost ([127.0.0.1]:54573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSHGn-0002jo-Te for submit@debbugs.gnu.org; Fri, 12 Jul 2024 10:29:10 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:53450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSHGl-0002jc-CY for 70985@debbugs.gnu.org; Fri, 12 Jul 2024 10:29:08 -0400 Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-79ef72bb8c8so103868985a.2 for <70985@debbugs.gnu.org>; Fri, 12 Jul 2024 07:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720794486; x=1721399286; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=veSNzN+PGIMOP7fdnLtsSjYf0Am1sAYfUakBLHDASBA=; b=gyRNqsulHsM+v/UXr6mPKrfr0+td6zJX0j7Ojd/K/RzCd1fu1SOGSFaybplmwVZh1N 4Yl6a0zwHtRoWBYkvE/JGHscVg/C+zuObWsemG1mz+yGzdoCnozq2pBf/vCRwbRQEyGH aNflUKTnKR7tdoBRiFvtgwXoiBX1x382jT/CNVfmUnoCKy2Ax8rTYdQB4rtctX1qGJDV u3ayjwSrEdj4fJabsluQJ4MMQ08QdTBdJji88IgFHzvDrsBJ5NcK+lLcjhlNGv9H7NKR 9WNIvFqDol9fWiRjXNhWfuCP09Qz9fpWsQlKMLHKonPTByoN2Y9djnfcIY1HhQG9mY6Y sKTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720794486; x=1721399286; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=veSNzN+PGIMOP7fdnLtsSjYf0Am1sAYfUakBLHDASBA=; b=BdQ9Mj6IdqttEnQyxo95aTmaHbkjw4QLaaVx/V9QdIXarxf5ThbEqR9gB9HSd+eg/b D0TWyaJZAPqfZ83R0ctHACkvKgt4Ss5jPUspKPt/zPan4rACNUxGqQF7Ws9ySkCIzDBE xxvOMg5uFXGItY7utHhQLUR2ZCcVvhFVohPxYbdWZSYeGs9gUkTPXWqFCqca/+wG3pZB vAi5GmYU1l/Fnbp0d1sHyL9nGCZaBQDCj8mZFonlbJUu2pcfco6/+tkQOXV5LKQ95DF+ Y9cjq65S82SiZQNkqZKuWNvTx0/Rh7K4gY9t2Ib4OVLiYd02jkSOxKDMZcRDtfDyzh5Q aLUw== X-Gm-Message-State: AOJu0YxaclQ71pJekQk+Y/wh1qGHJ9kX3cktOeVVxuqKxMeu7vQxtcMx Iaiz6dgoRbCfDumwp39Mytfcll+TeM+pZl87GERxL2j63jyrfu1WvMlMxcMr X-Google-Smtp-Source: AGHT+IFQUlQtwN+n1tr6/WM7Qm6UBHRIwlAf8eNG6VPjCa6cT1+JUuTbAzqUwuqCJNgvqYiRAW02Cw== X-Received: by 2002:a05:6214:5002:b0:6b5:4435:fe50 with SMTP id 6a1803df08f44-6b61bf1b90cmr136740646d6.37.1720794486342; Fri, 12 Jul 2024 07:28:06 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61baa24efsm35269826d6.142.2024.07.12.07.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 07:28:05 -0700 (PDT) Date: Fri, 12 Jul 2024 17:28:04 +0300 From: Efraim Flashner To: Christopher Baines Subject: Re: [bug#70985] [PATCH v3 5/6] gnu: rust: Guard against unsupported rust targets. Message-ID: Mail-Followup-To: Efraim Flashner , Christopher Baines , 70985@debbugs.gnu.org References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="o/D4t53RoYsaTejo" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70985 Cc: 70985@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --o/D4t53RoYsaTejo Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I like this. We can always add more platforms later with their platform-rust-target later as needed. On Fri, Jul 12, 2024 at 02:41:44PM +0100, Christopher Baines wrote: > As cross-libc may return #f in this case, and the config.toml file > construction will also fail if the platform rust-target is #f.. >=20 > * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against > unsupported rust targets. >=20 > Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 > --- > gnu/packages/rust.scm | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index a385344473..8119f4560a 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -73,7 +73,9 @@ (define-module (gnu packages rust) > #:use-module (ice-9 match) > #:use-module (ice-9 optargs) > #:use-module (srfi srfi-1) > - #:use-module (srfi srfi-26)) > + #:use-module (srfi srfi-26) > + #:use-module (srfi srfi-34) > + #:use-module (srfi srfi-35)) > =20 > ;; This is the hash for the empty file, and the reason it's relevant is = not > ;; the most obvious. > @@ -1309,6 +1311,13 @@ (define*-public (make-rust-sysroot target) > =20 > (define make-rust-sysroot/implementation > (mlambda (target base-rust) > + (unless (platform-rust-target (lookup-platform-by-target target)) > + (raise > + (condition > + (&package-unsupported-target-error > + (package base-rust) > + (target target))))) > + > (package > (inherit base-rust) > (name (string-append "rust-sysroot-for-" target)) > --=20 > 2.45.2 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --o/D4t53RoYsaTejo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaRPWwACgkQQarn3Mo9 g1GyLw/9ENHYfAbUz/t6L2R24zjxVVvUykYpqscV1mSRcbJeoG6fCby09IRUO7Lo /k1ReuqBjpD1swLwj5XSe0B3WOZl6mJ2/oWJgts8f8Gidsqf1Luq7PFnCUpkbuS0 ACB14m6kZ8zCsZGtZTwDheTQ9l2OOOyCPVY+k5nU8t+Y0KZjAkii5KVvLdZc2Gv3 zB4NiTMBYoVT5MXRfqThkx8U5hwvxkwJhaCq49VqIAbg/KDTe+dS3+R4ZDyNQfhz xSJ34GX6K7UgC1WezU57iYz/3WmeoHznxcIhDlGFjlwhWlE4ptp46PU86Q2CigL4 e7njDBSiaQcjIuPZAtbkx4CUKa1bGHVjebwaC/UnRe5wC4+Up5ICMI/IMae/ongn Q2av/+5jB9N/FdeFs24G8594r3B/MhKaCDCj+qdU3rp7PxiK7zAIysonqK6drcvp wVfc5VxUqSUkidJ8D+6cLzZz1QKuF7V5BgdqeTPgtG99bGhvUYWIhGVF2hgwpIt1 JEKl6G8FC3vRiSrUIJbN1SPK0+Cb45q2p8j8iSc7H7SkLV3nuGGruoZlTKx0uCSo NWzscRAyRlkng8z/sa+nYy14QmvZoUPFeTg7GOWXKJoeRO3US/aqs1fF55ZzoWaY LpHms0pxJMXvJigsnanxPi+UbBDP3OiXrt+8pmahekEQ2g3EskQ= =WsDJ -----END PGP SIGNATURE----- --o/D4t53RoYsaTejo-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 18 10:16:57 2024 Received: (at 70985-done) by debbugs.gnu.org; 18 Jul 2024 14:16:57 +0000 Received: from localhost ([127.0.0.1]:37787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sURwH-0003mX-Ce for submit@debbugs.gnu.org; Thu, 18 Jul 2024 10:16:57 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sURwF-0003mP-Hb for 70985-done@debbugs.gnu.org; Thu, 18 Jul 2024 10:16:56 -0400 Received: from localhost (unknown [212.132.255.81]) by mira.cbaines.net (Postfix) with ESMTPSA id E947A27BBE2; Thu, 18 Jul 2024 15:16:49 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e4ddf297; Thu, 18 Jul 2024 14:16:49 +0000 (UTC) From: Christopher Baines To: Efraim Flashner Subject: Re: [bug#70985] [PATCH v3 5/6] gnu: rust: Guard against unsupported rust targets. In-Reply-To: (Efraim Flashner's message of "Fri, 12 Jul 2024 17:28:04 +0300") References: <7783ce71e892ea74f025323e0a4d323ee8e720fc.1720791705.git.mail@cbaines.net> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Thu, 18 Jul 2024 15:16:47 +0100 Message-ID: <87sew66b00.fsf@cbaines.net> 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: 70985-done Cc: 70985-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Efraim Flashner writes: > I like this. We can always add more platforms later with their > platform-rust-target later as needed. Great. Late reply but I went ahead and pushed this to master as 32eda739664901b6df680e79f869e439a326572f. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmaZI89fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xd73Q/+PMZ+DilTANctaqxcG8iJkyhlswQ1jOAu /qwYwESdhUTAuynx5QkvCAiWnbm0l8Mqtd4WPh8eS7oy80hY3kkca7ddVero+Ryj /xTvUDDWfNEziDoJiNfgL3eyRjyQ47KR1bMuoiOTRf0qAHnGV4Efdrc3+osQNaCS 9O3MNZSEo1dh+LCfCB8sffw7Ez55/S/2c0A7GtZt9mfKb+15o0rQvVrZ4FNbi46m nZNMJyPK6Kn/IRsih1wqVZFY1owTjqshIgntVAaxoQexKIEtJk2VIZ5Pgp8fSzTq 2lPI4t8sZ53p9AKdazzOuAGw4TBe5aTXySnKvRsDwy99cA/OKrNu23Sw8XplZ44N WXW03s9Xfratpx12NcFH22z3OEV5afY8HuCxx1ipcEHD39agT5jlkrF54Bf0daGu BHkdJQTIooVee50fvYUcd//aJ1SV32//amzPLNpTRhAyjJGFjbQypLMhm1TJcgEm NwY5TZ2wFWG6M529FCLCos3Iatq2cLI6rCx0pc1LFjaidF5P/LLULzKRYr5pxRNB huOj+IQKaXb6cMhjGvrK6nO6Zl5p9aioyAGSXuy84g+K1yUxIARygaXIQKZqWXXT 3i8lXAMAPaL7Cyf6i5E+sG4hz2cYCGJ38HXtcfd73lYU8s2RXdlc15C7f9XH3M0N uoHqpEaF+Bs= =V/nY -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jul 21 02:27:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 16 Aug 2024 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator