| Message ID | cf6e4e48c30561c8f4e3ce3b34b5b20484b001ed.1745855744.git.hako@ultrarare.space |
|---|---|
| State | New |
| Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B7E4327BC4B; Mon, 28 Apr 2025 17:34:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4AFB827BC4A for <patchwork@mira.cbaines.net>; Mon, 28 Apr 2025 17:34:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1u9RQ6-00083R-6D; Mon, 28 Apr 2025 12:33:33 -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 <Debian-debbugs@debbugs.gnu.org>) id 1u9RPG-0007f7-Hv for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:40 -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 <Debian-debbugs@debbugs.gnu.org>) id 1u9RP6-0004Rf-Qc for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OxqCuJLAlkge6OapiDdxrL62v4N47pf05yIft2lu4EA=; b=Yc3eNeYhjlFF0T2uo/iqvHcb7Fnkp4A4VqVj63HiiWqaY2xGUsEF3EY1aXxH26SpvfFtkSHzJN2dzlawKB6a0oTEpSbFSIZBA2YVcrgg7+bcHKj4LpOixlHvtqtInq7kJ1dPhv2T6GMmRZ6HqkZJY8Jl1K5VaWw8uJX+a0f+D/vWYc8uN8ggm55sDK7OGiXyOMnTjgvzjZVoFCSqrMcbirJR8D1kFIFxewE5FpHv7n6ULfkl1ndmZpX313WPFirKjK4dj7ru+jrPLd8v8i4p0R6BAXCQQZ6sGIyeK4zyhFaUvFYJle9Zzp9mszHCGImewt0Cu0GHUCJ0wt+uZti9JA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1u9RP0-0003Kp-TG; Mon, 28 Apr 2025 12:32:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH v4 rust-team 17/22] build/cargo: Unconditionally use system gettext. Resent-From: Hilton Chain <hako@ultrarare.space> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: divya@subvertising.org, efraim@flashner.co.il, hako@ultrarare.space, steve@futurile.net, guix-patches@gnu.org Resent-Date: Mon, 28 Apr 2025 16:32:18 +0000 Resent-Message-ID: <handler.77093.B77093.174585793112661@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77093@debbugs.gnu.org Cc: Hilton Chain <hako@ultrarare.space>, Divya Ranjan Pattanaik <divya@subvertising.org>, Efraim Flashner <efraim@flashner.co.il>, Hilton Chain <hako@ultrarare.space>, Steve George <steve@futurile.net> X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik <divya@subvertising.org>, Efraim Flashner <efraim@flashner.co.il>, Hilton Chain <hako@ultrarare.space>, Steve George <steve@futurile.net> Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174585793112661 (code B ref 77093); Mon, 28 Apr 2025 16:32:18 +0000 Received: (at 77093) by debbugs.gnu.org; 28 Apr 2025 16:32:11 +0000 Received: from localhost ([127.0.0.1]:32883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1u9ROt-0003Hz-8B for submit@debbugs.gnu.org; Mon, 28 Apr 2025 12:32:11 -0400 Received: from mail.boiledscript.com ([2a01:4f8:242:4aeb::42]:60542) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <hako@ultrarare.space>) id 1u9ROX-0003D2-0K for 77093@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:51 -0400 From: Hilton Chain <hako@ultrarare.space> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745857907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OxqCuJLAlkge6OapiDdxrL62v4N47pf05yIft2lu4EA=; b=hVm2LBF8khWoTJCVUprxQ7HuN/oEjUrC3Ccr9oax9a5BuG6ZWYvc7By9lV2fz/MGc1GiHr 81ZTqAA9l3xBEJI9/o3MiODONti1rj//9ZIgtbRYSYvFLEdadXAyczBX6aT1x2z/a9qAWS 856QunuTF9ckrSHx2HBt9pXmPjeNDl/lAFkL2eNbDNaOn99moaMaWmbiysaHj8LPyHmRql bhzehGxiGDBxVXDPQ41ppdOXyz5eCEIOm9+Ndg3vHceb64YoG08FgkKtVxFx2jF22uuEWW GifbVIiiS1G8iIjclbFtMHOTAZYWt6tv17URIa7m8dfY/fbFvR14qjalloZSog== Date: Tue, 29 Apr 2025 00:23:14 +0800 Message-ID: <cf6e4e48c30561c8f4e3ce3b34b5b20484b001ed.1745855744.git.hako@ultrarare.space> In-Reply-To: <cover.1745855744.git.hako@ultrarare.space> References: <cover.1745855744.git.hako@ultrarare.space> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
| Series |
Cargo.lock importer and build system changes.
|
|
Commit Message
Hilton Chain
April 28, 2025, 4:23 p.m. UTC
No special value is required for this environment variable. * guix/build/cargo-build-system.scm (configure): Set GETTEXT_SYSTEM unconditionally. Change-Id: Id40fecaf75fa76c7b7f1404db226fa1ca6a45a5e --- guix/build/cargo-build-system.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 39a9487841..edc4e0d836 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -247,6 +247,7 @@ (define* (configure #:key source inputs (setenv "TARGET_PKG_CONFIG" (string-append target "-pkg-config"))) (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))) + (setenv "GETTEXT_SYSTEM" "1") (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSQLITE3_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") @@ -255,8 +256,6 @@ (define* (configure #:key source inputs (setenv "ZSTD_SYS_USE_PKG_CONFIG" "1") (when (assoc-ref inputs "openssl") (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl"))) - (when (assoc-ref inputs "gettext") - (setenv "GETTEXT_SYSTEM" (assoc-ref inputs "gettext"))) (when (assoc-ref inputs "clang") (setenv "LIBCLANG_PATH" (string-append (assoc-ref inputs "clang") "/lib")))