From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org> 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 6FNnOVGPM2fihAEAqHPOHw:P1 (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Tue, 12 Nov 2024 17:24:34 +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 6FNnOVGPM2fihAEAqHPOHw (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Tue, 12 Nov 2024 18:24:34 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bmg8txmQ; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AwlIfhUh; dmarc=pass (policy=none) header.from=gnu.org; 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-Seal: i=1; s=key1; d=yhetil.org; t=1731432273; a=rsa-sha256; cv=none; b=PC7RcWqsOV/6WlwmgS1zyBme86gSC19jTjim2TGQqQOYBVRRtBNz9nZduCffAKzKM9TMoa EhSmQp0FGBM3hxPYVPc4Dsg4a2kYRmRK5EBTiu0KVIXeaWf58nDq8XecZfRwOzqoPDOsHe tpEpGiB5KTfClKof2QUmqT5VosYasX3Uq6vanUuuiZBjCDpyyXECeAh5JoE1+cm68CIoDN 2O5rPv/Rz1DhdLdxiTL+/pzpXOqHiYvHC9YGtxZCUZAwMkKS8sL0rFyMg/8VC2cJKk+tWu UGbGH+QsQpLddA34ZtgGKcxo0ao3Na6WWmov2pII8Z2FA++oDu8TPowFyzGqdA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bmg8txmQ; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AwlIfhUh; dmarc=pass (policy=none) header.from=gnu.org; 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=1731432273; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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:dkim-signature; bh=fTjSU5bAfo5OPDt+EeNRYzuUAxdklaURCd5yJwCmWMM=; b=kQW0rRYdjmu2OVDe3vi0Sbr+ZY8J37A0t78dnqZkXH7M5Ew5XfjquS9G6Kw+gsLRBKN/OY Nw6Bytp3m7/voq+94xtq3nuwkQQ1MjWIYaHqHmqjjEZFnPfdkNKm4XyR1r6qebaAmyEn09 OsOns6+0c2hHBQNZd3P1ZOYNXeOJ2hmPnILmMWljy71pByHFCya/19137qv/PSAxVVn/qg +tsmMciO8SLW/Yjt4imNucGhjkUfzLky1eQrexx8X7GDfk1hqeOQtVFFoMCQV9dqn19uTu jyThsoq1m48ff9E4zijzRdNG1vgSIugGUPcnlSbWZJSnIZ5/adICfriuf9kc/w== 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 9B9958106D for <larch@yhetil.org>; Tue, 12 Nov 2024 18:24:32 +0100 (CET) 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 1tAtnX-0004yH-HO; Tue, 12 Nov 2024 11:31:23 -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 <Debian-debbugs@debbugs.gnu.org>) id 1tAtnE-0004iT-BR for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -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 <Debian-debbugs@debbugs.gnu.org>) id 1tAtnE-00064z-1Q for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 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=fTjSU5bAfo5OPDt+EeNRYzuUAxdklaURCd5yJwCmWMM=; b=bmg8txmQAlebcx1x/BWdaOqEfOzFkqtdLby1IWsFWmgIDxGwzBRu7kvX+LFzEof3lQjAAFdYj7KHqcBPrKMkKPSn6oWBQTLOkxmlzIYKsc7c8OrhZwSeob3lntiZt0qJcH6fVPIKuBGhtwr54iuHy8l0VChqeYMhZ5PL0k8bCcz0jcD/MSZTum/pA+KlPlJeuJoW2YbfNzTJAVsjI1sqk63JOx6v7uxn59hJDRaQA8T5KJlq8YB7IHwUw/2RM4gtaISWdWMhV8M7SdUpFkSZ3Ddwt/Wo44nTA0Rn/KcLDMu48MHPkhHgBhjTgJcuLAnEZ7rKLOWQqOrlsilwe/XiIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tAtnD-0000dZ-S7 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 36/40] gnu: gettext: Fix cross-build shebangs. Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:03 +0000 Resent-Message-ID: <handler.74290.B74290.17314290272274@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290272274 (code B ref 74290); Tue, 12 Nov 2024 16:31:03 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:27 +0000 Received: from localhost ([127.0.0.1]:39261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tAtmd-0000aV-06 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1tAtlv-0000Ld-UY for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@gnu.org>) id 1tAtjl-0005S3-FL; Tue, 12 Nov 2024 11:27:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=fTjSU5bAfo5OPDt+EeNRYzuUAxdklaURCd5yJwCmWMM=; b=AwlIfhUha9bdmkYYbrWN JZwDXCiMD1aso8us9uhqoJ4OFf1jHgywDCWxIQSHWbnmRGm4eOz/abauhFJUpeicLa0rbTE7edLXK hjZ5lCBdx0HrP/J9wS/GDn7K1dV/tNYu4ab7fFUJolnb8iJ40QB5VnQEJnS4QO1aAbc/mZwtYUw0s wztWnYa2m68iNxq8c6w5hJR9FGOldl5H6f4gbe9apr7E1pG5hjfnCNTsQq4ajet11ukoJJC/E19KO nV3TU4VzWnPzMn9yXmtdezIcnZMJ2g2Ef8/qv2qUU/ikrrD9uFXe13ctnEp5AzeZVJboLcdeW2N9r aq+5VDeDpZ9Y6g==; From: Janneke Nieuwenhuizen <janneke@gnu.org> Date: Tue, 12 Nov 2024 17:25:45 +0100 Message-ID: <73bba6d236af4d1501d9a28f94dba8aa77f4148c.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <cover.1731427612.git.janneke@gnu.org> References: <cover.1731427612.git.janneke@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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+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-Spam-Score: 1.38 X-Spam-Score: 1.38 X-Migadu-Queue-Id: 9B9958106D X-Migadu-Scanner: mx12.migadu.com X-TUID: 4k067SogAAJN This fixes running autopoint from a cross-built gettext[-minimal]. * gnu/packages/gettext.scm (gettext-minimal): When cross-building, add stage "patch-cross-shebangs". Change-Id: I5029a3be0b5cee3c173de66d8f0b027b02c3bc47 --- gnu/packages/gettext.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index cabe4f3be9..7862c296bd 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Miguel <rosen644835@gmail.com> -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 EuAndreh <eu@euandre.org> ;;; Copyright © 2022, 2024 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com> @@ -130,7 +130,19 @@ (define-public gettext-minimal ((" test-tls\\$\\(EXEEXT\\) ") " "))) '()) - #t))))) + #t)))) + #$@(if (%current-target-system) + #~((add-after 'install 'patch-cross-shebangs + (lambda _ + (let ((path (list (string-append #$bash-minimal "/bin")))) + (define (patch-cross-shebang file) + (patch-shebang file path)) + (with-directory-excursion + (string-append #$output "/bin") + (for-each + patch-cross-shebang + '("autopoint" "gettext.sh" "gettextize"))))))) + '())) ;; When tests fail, we want to know the details. #:make-flags #~'("VERBOSE=yes"))) -- Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com