From patchwork Tue Nov 28 10:52:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 56885 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D1C2127BBEA; Tue, 28 Nov 2023 10:54:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE32627BBE2 for ; Tue, 28 Nov 2023 10:54:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7vj9-0005zI-TX; Tue, 28 Nov 2023 05:54:03 -0500 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 1r7vj7-0005xV-09 for guix-patches@gnu.org; Tue, 28 Nov 2023 05:54:01 -0500 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 1r7vj6-0007SC-1L; Tue, 28 Nov 2023 05:54:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7vj7-0001wv-Uy; Tue, 28 Nov 2023 05:54:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67506] guix: platform: Add platform-rust-architecture. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 10:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67506 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 67506@debbugs.gnu.org Cc: Efraim Flashner , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.17011688297473 (code B ref -1); Tue, 28 Nov 2023 10:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2023 10:53:49 +0000 Received: from localhost ([127.0.0.1]:45490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7viu-0001wT-Ug for submit@debbugs.gnu.org; Tue, 28 Nov 2023 05:53:49 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7vis-0001wD-R6 for submit@debbugs.gnu.org; Tue, 28 Nov 2023 05:53:47 -0500 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 1r7vig-0005QC-J4 for guix-patches@gnu.org; Tue, 28 Nov 2023 05:53:34 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r7vie-0007JX-9f for guix-patches@gnu.org; Tue, 28 Nov 2023 05:53:34 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-54b8a4d64b5so2021081a12.0 for ; Tue, 28 Nov 2023 02:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701168810; x=1701773610; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=no8iYKhj3bZi9mkdieMzzLvIv7LLzRFtBf+2W0cIrpc=; b=WBtxAM64cl5G27+HPC/XM8mEE9ioQCXnbfItOrT5iPOzjjwp6BjLCprFJML0KaUWGc hv4+lDCOkK2A0YRdM5f4DHgQMcrubWuLlHxfuNDc4wQ3w5g3L108x5yy66Qj4Ag2Oi2Y dTauzP4sTwxgs3nRxlVN1PsCT5W/8Y6m6jAJlJh+z1QBf8c/v9CYlyWVr9Of/SJ1Dthn lVApEHHmatzL1cL3nCfyjwmYoHm+7ezntxNodjLCStYp0vEm2Mn47iLvLL8mybZ9EoEs V11Q10MR3UQ22oEJp0tMoJmhrgJptwK68bg427jpFDyqOIIJWvzg7udRgPN1+TNb656b 3/vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701168810; x=1701773610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=no8iYKhj3bZi9mkdieMzzLvIv7LLzRFtBf+2W0cIrpc=; b=VKCiFZFNAKoFxtV9DKIN0Ktd7e8g1RWazuTit4/FnxONNOqcARPOsIbq70xdpN3Am9 pdxCgFEZg6NnSiByDmO1oFwGRKpRszp2wHQ18KKdS3LT0LsUW7W2QxtB0ntK7ynHSenB 5IrVl7zuHaYa+5Yj9gH59XaTfuDYXhaRUO+Zkzo3CLa6u/geFJZlHQ1n02GIhsuYCwAz dEStS3KmqXSIW7mB9rUXEmDkNquSz7Da91x3mW85MCUYNpQNc40hyZCX5cltna5RIKlG X6m95E7UiC1toa8EEBugcEkgnwUSLwcHudhvYhpa7SYDyJC+H4kFj9O1/JORxQ16yywj SxTg== X-Gm-Message-State: AOJu0Yz+QjPbwqM5rNyShmSKsvTijeJApd917LC7Kg+FXxxeSJDTUMBa iPWGxl+tZS2EYXcPfA1XahjgzSh6SzK/pw== X-Google-Smtp-Source: AGHT+IESh3xiJS0zeUJDhZOB/34PEeHsr51WijbyfmcK8qk22gdryb6h8TTiP3MN210ukayaonaIkQ== X-Received: by 2002:a05:6402:371:b0:54b:852d:f93a with SMTP id s17-20020a056402037100b0054b852df93amr3086461edw.32.1701168810572; Tue, 28 Nov 2023 02:53:30 -0800 (PST) Received: from localhost ([176.12.138.93]) by smtp.gmail.com with ESMTPSA id eh9-20020a0564020f8900b005486f7f654dsm6267454edb.7.2023.11.28.02.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 02:53:29 -0800 (PST) From: Efraim Flashner Date: Tue, 28 Nov 2023 12:52:11 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=efraim.flashner@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/platform.scm : Add rust-architecture field. * guix/platforms/arm.scm (armv7-linux, aarch64-linux): Add the system's rust architecture triplet. * guix/platforms/mips.scm (mips64-linux): * guix/platforms/powerpc.scm (powerpc-linux, powerpc64-linux, powerpc64le-linux): * guix/platforms/riscv.scm (riscv64-linux): * guix/platforms/x86.scm (i686-linux, x86_64-linux, i686-mingw, x86_64-mingw, i586-pc): Same. Change-Id: Id9dca0fb8ec2b3bf2b3876b974e4bbaa30dbc6a6 --- guix/platform.scm | 3 +++ guix/platforms/arm.scm | 2 ++ guix/platforms/mips.scm | 1 + guix/platforms/powerpc.scm | 3 +++ guix/platforms/riscv.scm | 1 + guix/platforms/x86.scm | 5 +++++ 6 files changed, 15 insertions(+) diff --git a/guix/platform.scm b/guix/platform.scm index 55917ca308..bcc2bc3e16 100644 --- a/guix/platform.scm +++ b/guix/platform.scm @@ -29,6 +29,7 @@ (define-module (guix platform) platform-target platform-system platform-linux-architecture + platform-rust-architecture platform-glibc-dynamic-linker &platform-not-found-error @@ -74,6 +75,8 @@ (define-record-type* platform make-platform (system platform-system) (linux-architecture platform-linux-architecture (default #false)) + (rust-architecture platform-rust-architecture + (default #false)) (glibc-dynamic-linker platform-glibc-dynamic-linker)) diff --git a/guix/platforms/arm.scm b/guix/platforms/arm.scm index 32c0fbc032..02337ee6b3 100644 --- a/guix/platforms/arm.scm +++ b/guix/platforms/arm.scm @@ -27,6 +27,7 @@ (define armv7-linux (target "arm-linux-gnueabihf") (system "armhf-linux") (linux-architecture "arm") + (rust-architecture "armv7-unknown-linux-gnueabihf") (glibc-dynamic-linker "/lib/ld-linux-armhf.so.3"))) (define aarch64-linux @@ -34,4 +35,5 @@ (define aarch64-linux (target "aarch64-linux-gnu") (system "aarch64-linux") (linux-architecture "arm64") + (rust-architecture "aarch64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-aarch64.so.1"))) diff --git a/guix/platforms/mips.scm b/guix/platforms/mips.scm index e6fa9eb292..5c1aef5f4f 100644 --- a/guix/platforms/mips.scm +++ b/guix/platforms/mips.scm @@ -26,4 +26,5 @@ (define mips64-linux (target "mips64el-linux-gnu") (system "mips64el-linux") (linux-architecture "mips") + (rust-architecture "mips64el-unknown-linux-gnuabi64") (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/guix/platforms/powerpc.scm b/guix/platforms/powerpc.scm index 1c7141ab42..9730e74288 100644 --- a/guix/platforms/powerpc.scm +++ b/guix/platforms/powerpc.scm @@ -28,6 +28,7 @@ (define powerpc-linux (target "powerpc-linux-gnu") (system "powerpc-linux") (linux-architecture "powerpc") + (rust-architecture "powerpc-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld.so.1"))) (define powerpc64-linux @@ -35,6 +36,7 @@ (define powerpc64-linux (target "powerpc64-linux-gnu") (system #f) ;not supported (linux-architecture "powerpc") + (rust-architecture "powerpc64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld64.so.1"))) (define powerpc64le-linux @@ -42,4 +44,5 @@ (define powerpc64le-linux (target "powerpc64le-linux-gnu") (system "powerpc64le-linux") (linux-architecture "powerpc") + (rust-architecture "powerpc64le-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld64.so.2"))) diff --git a/guix/platforms/riscv.scm b/guix/platforms/riscv.scm index c716c12c12..ec400a2f0c 100644 --- a/guix/platforms/riscv.scm +++ b/guix/platforms/riscv.scm @@ -26,4 +26,5 @@ (define riscv64-linux (target "riscv64-linux-gnu") (system "riscv64-linux") (linux-architecture "riscv") + (rust-architecture "riscv64gc-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-riscv64-lp64d.so.1"))) diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 6f547dd770..05c69f0d4c 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -30,6 +30,7 @@ (define i686-linux (target "i686-linux-gnu") (system "i686-linux") (linux-architecture "i386") + (rust-architecture "i686-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux.so.2"))) (define x86_64-linux @@ -37,22 +38,26 @@ (define x86_64-linux (target "x86_64-linux-gnu") (system "x86_64-linux") (linux-architecture "x86_64") + (rust-architecture "x86_64-unknown-linux-gnu") (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2"))) (define i686-mingw (platform (target "i686-w64-mingw32") (system #f) + (rust-architecture "i686-pc-windows-gnu") (glibc-dynamic-linker #f))) (define x86_64-mingw (platform (target "x86_64-w64-mingw32") (system #f) + (rust-architecture "x86_64-pc-windows-gnu") (glibc-dynamic-linker #f))) (define i586-gnu (platform (target "i586-pc-gnu") (system "i586-gnu") + (rust-architecture "i686-unknown-hurd-gnu") (glibc-dynamic-linker "/lib/ld.so.1")))