From patchwork Tue Nov 12 16:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70321 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 3E61627BBE2; Tue, 12 Nov 2024 16:32:09 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 CC9E927BBE9 for ; Tue, 12 Nov 2024 16:32:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:03 +0000 Resent-Message-ID: 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 ) 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 ) 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 ) 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 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: References: MIME-Version: 1.0 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 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 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Miguel -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2022, 2024 gemmaro ;;; 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")))