From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id 8GFoGEbmQmcxnAAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:39:34 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id 8GFoGEbmQmcxnAAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:39: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=DixYFjLF;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=rl6BI5Mj;
	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=1732437574; a=rsa-sha256; cv=none;
	b=syrbe1EmWzisHvm9OoJ64U9Uk3WhztawpQ1bYRX0rFtICCTR5jn4gQO0z6n1OsP2YOcXQ6
	z8xj2LQIv2ON4RHz9oTaOOoklvjj09q5wUIC8a/XpK/nJfywbCaSZ/TtbceWzid4+pRjmo
	oQwbwLmqYsGQLL4I2Suohd7JUr+XwIunU2+vrmD6V9Z9XBxJLjGsGLNQnj1QgFNWq/KpHO
	siF5kyOw+/778D/QYo+Dh4ncWzB3oCilzrPn3NqjhCNzkCNQUbIjea8FL39hKSMwKezPv0
	Ba5LXrwjILXcnYm3I8odG2qebxv4/9a/X0hTl5TrPsp298e6c6M86whzqwUBVw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=DixYFjLF;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=rl6BI5Mj;
	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=1732437574;
	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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=;
	b=gQnvFLwboXJBjqtw3SbD+5wTZ6/3S+dEuvc1ChCuuuRQVcjS2ksvJw7L/YuzeexcIHICmt
	p3a0Q0Im7VYZZVI2vrbeEvDFz1NaXnHnnh8CvuPOv2h3vlNRUaktYOau9AuqRdOQIvtbQY
	OKCVEAQerZu4RluLlLSRkh8Y36CeiW0/L4EaHjvS2VQT/bKj2xoLllxX9RtDeHOKaMuudt
	O06NbvoeXOkEtGM13qxgeqXLsXTcdGd0yYsg6L3p5K/D09kpRRHp5Cvba0Sy0EVCaf5g2g
	AFLSqK2PiPRcfGbaIootJCLx1i6xdH7GdUJrlCAqlEC3Id8oJ+6nxgFCDlmEeA==
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 D9F0D7946E
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:39:33 +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 1tF7W4-0001qL-Uv; Sun, 24 Nov 2024 02:58: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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Uq-0000T4-Q6
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:34 -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 1tF7Up-0002R3-7a
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=; 
 b=DixYFjLFXIOHHx+Q1AZ5gP5cXVqzy+AAQr/vf1/mBRQ1567pNcFHHx1kbt42oRcGFsEud5noD0qIvqFmk1cy05Vv1ohBkRPlU5LGMeRHQvYHQl9qxfstPNh9DkFn6+yKil5xQ8Nk8a1nw3wVY7FFlH5T57n2KC9LmWWAmBwZ9/zV5yonFtDeUczgJHWXTx9otwY393JeCdqSZKakW26ghJeAXiAtG8g0ANan/grR7dKjWzhPgNNnlXVXVFv8vIpKQFWOxmTGFW7buAeqjqpx8qABl07hoV+l2TsGCik3OTTOonC0w1fuSPnqC3xNzrKL6FRBAO5+P8GVrzw353iC1Q==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Up-0004o1-3X
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:31 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 47/58] 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: Sun, 24 Nov 2024 07:57:31 +0000
Resent-Message-ID: <handler.74290.B74290.173243504018275@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.173243504018275
 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:20 +0000
Received: from localhost ([127.0.0.1]:60878 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7Ud-0004kS-Mc
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:20 -0500
Received: from eggs.gnu.org ([209.51.188.92]:33696)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7UA-0004bv-Cy
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:50 -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 1tF7U5-0002Hy-75; Sun, 24 Nov 2024 02:56:45 -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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=; b=rl6BI5MjfmlKpOJuM2ak
 xH+fADZcdYIqlkbeO21ZXq5QJsm80Egx1rt0A1vtC0Hgy+5whpXsgdPNvSHauuT6XPsCqTx31lhZK
 IAJ2Y7RzbB0AxMF6MAOcZEkQ8Gq0VCDm0VpKnNdAs2xh4bgHLXKPo8WvnkfHuMr+VggF3QmxL/yOO
 2KUMK+jKSqsdTa4V7QysLRFytAv65tpDlbZK/pwIpGTg+odTDEmSk0VZpiiyrrduqCAdOERxsIzph
 4lnOq4xin31M08tqYpiZO6MPBJM1Y8un4oHe4qr4wBVNfIE4SnJLJF0b4E3G67/Z/bGv1kOZLvuwT
 xnrUnTeYesGzNw==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:55:10 +0100
Message-ID: <4c0fa7e093727553b20a0e09e582f032667dd566.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.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-Queue-Id: D9F0D7946E
X-Migadu-Scanner: mx13.migadu.com
X-Migadu-Spam-Score: -7.67
X-Spam-Score: -7.67
X-TUID: KCobZOvHDHQa

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")))
-- 
2.46.0