From patchwork Sun Feb 4 19:24:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 59793 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 B773E27BBEA; Sun, 4 Feb 2024 19:26:08 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 571F027BBE9 for ; Sun, 4 Feb 2024 19:26:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWi7j-0006Zy-T1; Sun, 04 Feb 2024 14:25:51 -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 1rWi7i-0006Zp-TS for guix-patches@gnu.org; Sun, 04 Feb 2024 14:25:50 -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 1rWi7i-0005jw-Kz for guix-patches@gnu.org; Sun, 04 Feb 2024 14:25:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWi7u-0003xp-Mp for guix-patches@gnu.org; Sun, 04 Feb 2024 14:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68928] [PATCH] gnu: guile-ics: Update to 0.6.0 and fix cross-compilation. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 19:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68928@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170707472115186 (code B ref -1); Sun, 04 Feb 2024 19:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2024 19:25:21 +0000 Received: from localhost ([127.0.0.1]:50060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWi7B-0003wm-T5 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 14:25:21 -0500 Received: from lists.gnu.org ([2001:470:142::17]:42996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWi78-0003wV-RL for submit@debbugs.gnu.org; Sun, 04 Feb 2024 14:25:16 -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 1rWi6q-0006QL-LS for guix-patches@gnu.org; Sun, 04 Feb 2024 14:24:56 -0500 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rWi6n-0005Kt-5C for guix-patches@gnu.org; Sun, 04 Feb 2024 14:24:55 -0500 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-51149561a39so895247e87.0 for ; Sun, 04 Feb 2024 11:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707074690; x=1707679490; darn=gnu.org; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=salNboZWm5EKNPSe8x8F7VoLsiRSEWelJ5SuaE6hAEo=; b=JU5foA7VLu5OdisYdk5PhDvkcjjlDxHTqwVnrc8FLV8mctVwKkCoFEZNaPs9NvHj9N b8ssvw0Dgu6WFxA0h7a02nMVT7BjOEkdJ6/y2HI7M5Ms9X91PAZqEWaTcZ7g1dZMTqCa ueMLaQUzK3+wFRJTlGyJMy/5UWsMx47Ue0skicMjfswGygXWZyr5z9vyckfwwc5/Nd/A ZfNaMP3NEDY3tTdCqOoeT+Bae/gG/rVaGe/Ip050gcDlP1aUtHQTc55sYwr6cCQptvYu B2b4LvWgfR7HA2u9LB3+GK4xV1h43QW9ca2PavSgc7lU9VioRFu/q6JzpxPhwEutXxwt PH8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707074690; x=1707679490; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=salNboZWm5EKNPSe8x8F7VoLsiRSEWelJ5SuaE6hAEo=; b=wEIWW7ZaTZZ49k3WY+ZT+OksMuYG4CdYIrQ4AcaaM+GLELKzi+WHc9eRTxUGPm+29J SYL4yD2X8DixUDcMcT3qviFL5W68qHsduFbfA2EOJt1xbpLOQRpuXBgBeiLQbiRjihbX iDGN9Dv772GPbmk0bVh2d7ug5BxN+59Qetdmz4bUNOleqhc/03y2HtfhInjOtBrhp+HP 7wzdTt+PuXjNY+yexgxXAHNbIWBJ09ObZ3nFSZj+D8alhHpiaJEVafIVrFYuVLLbkMSV l184JRXIiOPKyFORLQ44YMLlwp36rWX2lQbTqllO31f0C59zIt6Sv/Zp27UONJLXSGtw 3YYw== X-Gm-Message-State: AOJu0Yzpeco3npeDHvuzhTrFhCcmiVnue04imw+KpiqTtQmipaiks1qb 41K1UC44V4XLt1OAaVxIeD6ey5uoi+1PpTmRxSo+nzPFMOr+Z0Qa+BhhRCstRcI= X-Google-Smtp-Source: AGHT+IG521psqxrmKXWBd1TPYGoVF0sK8G4MVNkoDxe/Bcdrhn5dlWKWpqHVWr0pigGilkUx0KTVIg== X-Received: by 2002:a19:f519:0:b0:511:51e4:6eab with SMTP id j25-20020a19f519000000b0051151e46eabmr71773lfb.43.1707074689758; Sun, 04 Feb 2024 11:24:49 -0800 (PST) Received: from elephant ([5.164.220.172]) by smtp.gmail.com with ESMTPSA id h19-20020a19ca53000000b005115026abb5sm57870lfj.13.2024.02.04.11.24.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 11:24:49 -0800 (PST) From: "Artyom V. Poptsov" Date: Sun, 04 Feb 2024 22:24:47 +0300 Message-ID: <87zfwg2fsw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x134.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 Hello, this patch set updates Guile-ICS to 0.6.0 and fixes cross-compilation of the package. Thanks, - avp From d9c6763db49ba99c69d866d556a1dbabd53f2264 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <51bdaa4af22b98de6d0dc3d79860868809d78df8.1707074547.git.poptsov.artyom@gmail.com> References: <51bdaa4af22b98de6d0dc3d79860868809d78df8.1707074547.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sun, 4 Feb 2024 22:22:10 +0300 Subject: [PATCH 2/2] gnu: guile-ics: Fix cross-compilation. * gnu/packages/guile-xyz.scm (guile-ics): Fix cross-compilation. [native-inputs]: Add "guile-3.0", "guile-lib" and "guile-smc". (guile2.2-ics) [native-inputs]: Replace the inputs needed for cross-compilation with the same ones but for Guile 2.2. Change-Id: Ie35f8087b1db30992f63edac8d303f854139ecbf --- gnu/packages/guile-xyz.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 57a4b84efe..ce0affdaea 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2196,7 +2196,11 @@ (define-public guile-ics texinfo gettext-minimal ;Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. help2man - pkg-config)) + pkg-config + ;; needed when cross-compiling. + guile-3.0 + guile-lib + guile-smc)) (inputs (list guile-3.0)) (propagated-inputs (list guile-lib guile-smc guile-dsv)) (home-page "https://github.com/artyom-poptsov/guile-ics") @@ -2213,6 +2217,11 @@ (define-public guile2.2-ics (package (inherit guile-ics) (name "guile2.2-ics") + (native-inputs + (modify-inputs (package-native-inputs guile-ics) + (replace "guile" guile-2.2) + (replace "guile-lib" guile2.2-lib) + (replace "guile-smc" guile2.2-smc))) (inputs (list guile-2.2)) (propagated-inputs (list guile2.2-lib guile2.2-dsv guile2.2-smc)))) -- 2.41.0