From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IJiICsAykWajVQEAqHPOHw:P1 (envelope-from ) for ; Fri, 12 Jul 2024 13:42:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id IJiICsAykWajVQEAqHPOHw (envelope-from ) for ; Fri, 12 Jul 2024 15:42:24 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720791743; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=W7IonnsxeLY4xX2btXr4Y1nGiv6VLdpqNrBjPHw1iLY=; b=pjXQHCh4Hd+wilVLyT5GTiXjSkQ56lQBO69hZ7/Slmf+7e9Ydx7PXCiLX4q+ZrqUerla41 Gq1GgH70bSpQlwjGxY3tYEyVZ+JyCJLs389KI4K7qrcdtAmoWmd1PYuwwA+q3TOaHzsc8/ Lu5tJC0+TDEAu0lf5IRmGohF8mGf3G8VBNV46eIO2PNcBNLZMdrF77B1jCkhVCkh6lSq1g e3oYIQuLccpp0lqMx3YL1hMUFQkSZ2InKuercspFdeey4z/IDITgqs0DeJzbgO2YlfudaM z5YeTx2b0kn9xmiEMbHOajjDLHdvloOvcE8K+pGp0555vA/DkqDcOaFVd4Wrbw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720791743; a=rsa-sha256; cv=none; b=PzNfn+byZbGbvvZLzglnnDFw5Tua4YRvvneDvPzp8h0Mo/SC2Radjtb2ASHFqM8HmWP9Bh 7jXTsFm2kuNCnuj1v60OvFe0nTzbb4wA5Bx3VN8xbQOxY7kxNc5UDRixHPWfWojSg0NHAM RlUAwHKl9sY3YrU4r+gywV8i5H9fwUfbQ4PKICVgydwAVV3jdcDiosmsoYOlV0Y6bW1Pl3 jA6OyVkQ3muJslKQBJ2Ut1CByA0b+RaMEjoVmIzfG5qaMD5+EwTZMMrUTafuq/Xh504+DM oHO9ADchRG9D5Ly7EfGl18nXJhZOJYZU65pXlzSgx3th2DQ4cXfkaYnAqqKBTA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E3CF519EE9 for ; Fri, 12 Jul 2024 15:42:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSGXE-0002wA-Q4; Fri, 12 Jul 2024 09:42:04 -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 1sSGXD-0002pV-1q for guix-patches@gnu.org; Fri, 12 Jul 2024 09:42:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSGXC-0001Nv-Oa for guix-patches@gnu.org; Fri, 12 Jul 2024 09:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSGXC-0001Dy-OP for guix-patches@gnu.org; Fri, 12 Jul 2024 09:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70985] [PATCH v3 4/6] build-system: meson: Use a more specific exception. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jul 2024 13:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70985 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70985@debbugs.gnu.org Received: via spool by 70985-submit@debbugs.gnu.org id=B70985.17207917134664 (code B ref 70985); Fri, 12 Jul 2024 13:42:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: E3CF519EE9 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.90 X-Spam-Score: -4.90 X-TUID: rRZ8GcuGyAga 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