From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 GJUAG/dPEGQ1AQEASxT56A (envelope-from ) for ; Tue, 14 Mar 2023 11:44:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id qNYGG/dPEGSmUAAA9RJhRA (envelope-from ) for ; Tue, 14 Mar 2023 11:44:07 +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 B55A511A90 for ; Tue, 14 Mar 2023 11:44:06 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="ssz8Z5 E"; 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=1678790646; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=Mr8Uhr5bFeTntV9JAMxIRBIB+KmNjuw7kpbcweD7QjI=; b=T2qqTEGRoGQB8/EZfaRHKdo7dYpl5aMu/bLJf5OtL/2rGdJ1TP03cGmMrkGKJALKkqllNM iE4//bhD7DAe4BwCDjvmyDvgBGzxwHDnadHKeOooKvjjZT/fbWaAeSiYNUoX+4k4T87LyR yJr81464zDCO+j9pfUi5309I9MlWdNwoYSCSNlHrzK0hWMG3EceHsi6QCOAFmlUMAEr2ie 0fwPlFwgzduuByvUS47tZ5x5hFGPxNJpgFOQdIdDoyEqxkbjDS9lP9iWY8cuuMoo0YYu9y e/SzaNpi/mWng/uxC/RzSoW9HMK9epZpfuC60fOq0qFnwAwyz7XjqsPpZdnc/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="ssz8Z5 E"; 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=1678790646; a=rsa-sha256; cv=none; b=dpRmNrni2ER39ITCVDkeSHHJSI1aIqoX5koy1LibvP21OGyQl0FXHuV6bAOUSVRVFORIxO IMAdWRL778Xn7XfH1icCjdrlZ6yjK7d+ZnwkVT1VWEPv9rmjFfCFvD+m5s6kElsy3JleBs yn5n0Xq8rflPK5JBQPEgaH+pHEEJKkLLKDrUb8jqgEmO8OWkoRan7DMRolTYbrZztm0D6f kLH55PD9uYdif2aSrdzUE1tmNlHQ4W9ulS4sfyFY0n8k8AaXjTzoR75Of+JEL52kCFqZwE WKLExOMglv/vYOt36Um2Pnzovs7r+htRKSzZ9YmP9Z0TP1srsP60DrXtm/nj4Q== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pc28R-0006No-W8; Tue, 14 Mar 2023 06:44:04 -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 1pc28Q-0006NN-HF for bug-guix@gnu.org; Tue, 14 Mar 2023 06:44: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 1pc28Q-0001Qx-9D for bug-guix@gnu.org; Tue, 14 Mar 2023 06:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pc28Q-0005oy-5W for bug-guix@gnu.org; Tue, 14 Mar 2023 06:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#62181: [PATCH 1/2] gnu: gnulib: Reset the shebangs. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 14 Mar 2023 10:44: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 62181@debbugs.gnu.org Received: via spool by 62181-submit@debbugs.gnu.org id=B62181.167879062422312 (code B ref 62181); Tue, 14 Mar 2023 10:44:02 +0000 Received: (at 62181) by debbugs.gnu.org; 14 Mar 2023 10:43:44 +0000 Received: from localhost ([127.0.0.1]:36410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc286-0005nl-OM for submit@debbugs.gnu.org; Tue, 14 Mar 2023 06:43:44 -0400 Received: from planete-kraus.eu ([89.234.140.182]:38700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pc282-0005nP-SO for 62181@debbugs.gnu.org; Tue, 14 Mar 2023 06:43:41 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0ca7145d; Tue, 14 Mar 2023 10:43:32 +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 :mime-version; s=dkim; bh=uw+znGSy/h9APjf+zhQ5+cOzyBI=; b=ssz8Z5 Eod6hfNsy+vjD2eOu+BseZl4c2QVy6vZ3ttY7DhxaCf7tDIfUpKFOXYsY1367q1S QPDeK836Y+CREtkooErv6ie5t0G64b1s7G4vVDZASU/7EygY/sngi/PHWmpkp4ov lqZM1sYar+xLjpYTNXv3Wa5H2ftd7miiIpCaY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7e6555cd (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 14 Mar 2023 10:43:29 +0000 (UTC) Message-Id: In-Reply-To: References: <875yb3689f.fsf@inria.fr> 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: B55A511A90 X-Spam-Score: -4.22 X-Migadu-Spam-Score: -4.22 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: ZGC6Txfpzm8c * 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 | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 28ab77bbb4..f93a72f2f5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -973,12 +973,32 @@ (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 'reset-shebangs + (lambda _ + (for-each + (lambda (file) + (false-if-exception + ;; Might fail on binary files, this is not a problem. + (substitute* file + ((#$(file-append (this-package-native-input "bash-minimal") + "/bin/sh")) + "/bin/sh") + ((#$(file-append (this-package-native-input "python") + "/bin/python3")) + "/usr/bin/env python3") + ((#$(file-append (this-package-native-input "perl") + "/bin/perl")) + "/usr/bin/perl") + ((#$(file-append (this-package-native-input "clisp") + "/bin/clisp")) + "/usr/bin/clisp")))) + (find-files (string-append #$output "/src/gnulib")))))))) + (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