From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SPCkMRBzE2SDggAASxT56A (envelope-from ) for ; Thu, 16 Mar 2023 20:50:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MKNzMRBzE2TsNwEAauVa8A (envelope-from ) for ; Thu, 16 Mar 2023 20:50:40 +0100 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 4117139F93 for ; Thu, 16 Mar 2023 20:50:40 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="kpKS7p I"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678996240; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: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=8h8bj2AsVlr3JmAQUb5vA5z0bOTtvdXFEarb0hqrF7g=; b=NEuUt1PXnsQwxuZlhZ25cwie5WC3V/vV+GpJw5DEl11z/b+pze4d1kMQb1iXzdLOiBjxD1 O3vIcwFyQMt4rP4HB66ZaSkFK3rG3rRMCfBXoCLwoSMLvwJOKttZYkcFJo3oBWbuJpzVyh QNmjCS/CyOQBXV3YSdmQpAsk32KydfVqr3C58CGy6OiSHlpT8gLEAyzKnqFgwjjjLtNSRi XG1fGb04QZmpgQydXUuQ636wNEt7hk4vKL2SEMnxgNCIhaMiH2yEY8axcEXN+933l7w5H6 BZOUsZd03CS3UwiVPP08yiUsOWj9R7BJOp/eV1fSIOLorO+fUccW0SF0yngH2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="kpKS7p I"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678996240; a=rsa-sha256; cv=none; b=YMHSb0mbo1MI1jXIddw7np0NoXcez9+wSkHDp5QfTFyIzmBSGm6jia0A2zNvku5y+kjyYX A7kiPq3Y+n1KHejdKlHWcrxoTGSanwaBXy+sWilxOI4wa7w9yYVO9j8zIDI377xtLv5bPB 2h+7W0OOtz5kj9K1EllRVkzxP5cgdM7X0+GDSaBJaja/w8p/J3IeQRZLPYJaQrimPwxYeF WnxqCbzPLpG2XJOUAzcKGSorxbLFML1CWlhjJQDNfju3sgdilhU6FAdr0/56APaGcUL7hu m0US7GOJETxwReWwBMQpsLDfM6urMFslVyuq+8rg9/XuX+EDhfA9BnuQ6khIeQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pctc0-0002qM-Fr; Thu, 16 Mar 2023 15:50:08 -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 ) id 1pctbu-0002oD-Uz for bug-guix@gnu.org; Thu, 16 Mar 2023 15:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pctbu-0000AS-EJ for bug-guix@gnu.org; Thu, 16 Mar 2023 15:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pctbu-0002DI-AK for bug-guix@gnu.org; Thu, 16 Mar 2023 15:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#62181: [PATCH v2 1/2] gnu: gnulib: Reset the shebangs. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Mar 2023 19:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62181 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 62181@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 62181-submit@debbugs.gnu.org id=B62181.16789961678440 (code B ref 62181); Thu, 16 Mar 2023 19:50:02 +0000 Received: (at 62181) by debbugs.gnu.org; 16 Mar 2023 19:49:27 +0000 Received: from localhost ([127.0.0.1]:43120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pctbJ-0002C2-G9 for submit@debbugs.gnu.org; Thu, 16 Mar 2023 15:49:27 -0400 Received: from planete-kraus.eu ([89.234.140.182]:39304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pctbF-0002Bq-QR for 62181@debbugs.gnu.org; Thu, 16 Mar 2023 15:49:23 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 3b751901; Thu, 16 Mar 2023 19:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=dkim; bh=pKVV7hhRmTMnDnIwEflRBGCvVt8=; b=kpKS7p IsNghTJBK2Cfh7FtsfVMuU+UcFU/IpztyE4njR7C3/ZqLse5ICc9rVZg9YN1+OGD vyJnl1A3+Fl83lKsvPP1ZMyABzZMr5itnyoPrfeaVP7Z6AM/tulOf3gHsCvvXGky /G6u+THsO3sj/+xhZiLNJRDBXMFi1t5OEi3Xc= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b233bdea (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 16 Mar 2023 19:49:18 +0000 (UTC) Message-Id: <6f1b6d6cfd135b7aa9c254b15b5aa8b04deee135.1678995685.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Tue, 14 Mar 2023 09:58:34 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Migadu-Queue-Id: 4117139F93 X-Spam-Score: -1.74 X-Migadu-Spam-Score: -1.74 X-Migadu-Scanner: scn0.migadu.com Reply-to: Vivien Kraus From: Vivien Kraus via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: XVo6sPD4ajKj * gnu/packages/build-tools.scm (gnulib) [phase reset-shebangs]: After installation, rewrite the /gnu/store shebangs in the distributed build-aux files. [inputs, native-inputs]: Add bash-minimal. [phase let-autogen-execute-gnulib-tool]: Specify a shell to execute gnulib-tool from autogen.sh. --- gnu/packages/build-tools.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 28ab77bbb4..caf0f3fc1c 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -973,12 +973,25 @@ (define (find-ucd-files . names) ("NormalizationTest.txt" . "uninorm") ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) - (delete-file "gen-uni-tables"))))))) - (inputs ;; Shebangs for some auxiliary build files. - (list python perl clisp)) + (delete-file "gen-uni-tables")))) + (add-after 'install 'restore-shebangs + (lambda _ + (substitute* (find-files + (string-append #$output "/src/gnulib") + (lambda (fname stat) + (and (not (string-suffix? "/lib/javaversion.class" fname)) + (not (string-suffix? ".mo" fname))))) + (("^#! ?(.*)/bin/sh" _ prefix) + "#!/bin/sh") + (("^#! ?(.*)/bin/python3" _ prefix) + "#!/usr/bin/env python3") + (("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program) + (string-append "#!/usr/bin/" program)))))))) + (inputs ;; Shebang for gnulib-tool + (list bash-minimal)) (native-inputs (list - python perl clisp + bash-minimal python perl clisp ;; Unicode data: ucd-next ;; Programs for the tests: -- 2.39.2