From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id qCHgFD2nrl8ddgAA0tVLHw (envelope-from ) for ; Fri, 13 Nov 2020 15:33:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OEjEED2nrl/5YAAAbx9fmQ (envelope-from ) for ; Fri, 13 Nov 2020 15:33:17 +0000 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 A2A7B9401BD for ; Fri, 13 Nov 2020 15:33:16 +0000 (UTC) Received: from localhost ([::1]:44788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdb4d-0003eV-Al for larch@yhetil.org; Fri, 13 Nov 2020 10:33:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdb4Q-0003dD-3K for bug-guix@gnu.org; Fri, 13 Nov 2020 10:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdb4P-0000QX-K7 for bug-guix@gnu.org; Fri, 13 Nov 2020 10:33:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kdb4P-0004NB-Ih for bug-guix@gnu.org; Fri, 13 Nov 2020 10:33:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#25304: =?UTF-8?Q?Libtool=E2=80=99s?= ltmain.sh still contains a /gnu/store shebang Resent-From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 13 Nov 2020 15:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25304 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Received: via spool by 25304-submit@debbugs.gnu.org id=B25304.160528155716780 (code B ref 25304); Fri, 13 Nov 2020 15:33:01 +0000 Received: (at 25304) by debbugs.gnu.org; 13 Nov 2020 15:32:37 +0000 Received: from localhost ([127.0.0.1]:49111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdb40-0004MZ-Sq for submit@debbugs.gnu.org; Fri, 13 Nov 2020 10:32:37 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:44265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdb3v-0004MH-M6 for 25304@debbugs.gnu.org; Fri, 13 Nov 2020 10:32:35 -0500 Received: by mail-wr1-f46.google.com with SMTP id c17so10308827wrc.11 for <25304@debbugs.gnu.org>; Fri, 13 Nov 2020 07:32:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=kVIiwtgQR9p7+8KPDABZyh/sP7xe1nvhII/zY2YHGzY=; b=RH9E172cUCcxQehcZV5YkuZvpMZFKAMYTt6Y4TxA2hIB1rTL2aDN2SID8WkN7QrvDh VN1dvTMuEyREQRNmenxS+cD9MHoIUqBBeRO1/7a2jhcQ2JpwtmH5MU5JOpCHnHLSHCEk iSdemg7DLgnnzhOdpQJT+435OqOFoSheinnknsVRnlAyyvdWEfXy8os40FJRgP3BkEAS azcQykaaWyEvpPTRE/9eNWXFLnOvuX14fPPfscjm6L+HuLSAdKWh9SelUgbzUrfmbvOl xP23+JVx+WaedjoMuiJpmsI9w6H+1MmXHEQ+phHzBMWjocGUjBUik8iK8iqqZB8qM6vy JnQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=kVIiwtgQR9p7+8KPDABZyh/sP7xe1nvhII/zY2YHGzY=; b=G+pQaAmTAesUF6wsZvXydABpolPbTwvkDAIIJ/4ZznBdrhLnmzgn/hph9pl4invHbZ kt7/c7/IdFvXd7Py4QskRDaazfsHiZ0uoyWRaodthuiKmY501eqSBJt68aaFcgy4aoVY lMKWSHFthSZYZDl2J0Afuqd5X8RDsI8ohOjYHRKBNieyFj2X4FPeUc5587nfUuoccePm D+6mI2tDMaabL7ByPF8WOXGW77DMi1UeDIS7eKPZ1fREASn8nYlW5Ob7J5/e31z4HR5y s1NVhIDvq2outjHVbvZ21Bmj0JvG4GajiPHstkghPcmKuou326muOALaDwat/PhrXFmH U/5w== X-Gm-Message-State: AOAM533o75YM/zyLv697a4RpKjl6IT5hsoFq76uAIh1jjv5sJ10hmBMh IYwJMPmAe/um7i3Q+Q7plm7WxQVEacM= X-Google-Smtp-Source: ABdhPJwtp9qlMnFOOYSDXcacTgc1X0NuOvPX+wfGpP9GKalAzm53jNk+1ty99TcmUU83CzWWWEZk9A== X-Received: by 2002:a5d:4bc7:: with SMTP id l7mr4420619wrt.105.1605281541338; Fri, 13 Nov 2020 07:32:21 -0800 (PST) Received: from unfall (20.134.94.90.dynamic.jazztel.es. [90.94.134.20]) by smtp.gmail.com with ESMTPSA id d3sm11543277wre.91.2020.11.13.07.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 07:32:20 -0800 (PST) From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas References: <878tqx7zzj.fsf@gnu.org> <87mvb925po.fsf@gnu.org> Date: Fri, 13 Nov 2020 16:32:04 +0100 In-Reply-To: <87mvb925po.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Fri, 21 Apr 2017 16:30:43 +0200") Message-ID: <87v9e9z30r.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.8 (/) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 25304@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=RH9E172c; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -2.01 X-TUID: Ucq7jW70DRzO --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, I was looking through the lists because I have a patch that does exactly what you describe here. I guess this goes to core updates, so this version is on top of it. WDYT? Happy hacking! Miguel ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hi, > > Commit 98341757c8c45fca8d2b53f9972f5c6a32cf2c95, which was meant to fix > this bug=C2=B9, actually failed to do so: > > $ head -1 $(./pre-inst-env guix build libtool)/share/libtool/build-aux/lt= main.sh > #!/gnu/store/k7029k5va68lkapbzcycdzj7m5bjb4b8-bash-4.4.12/bin/sh > $ git describe > v0.12.0-3136-g7312c62d3 > > I think the problem is that we=E2=80=99re patching ltmain.in when we shou= ld > really be patching the final file, after the =E2=80=98patch-shebangs=E2= =80=99 phase. > > Ludo=E2=80=99. > > =C2=B9 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-libtool-Restore-shebangs-on-all-libtoolize-files.patch Content-Transfer-Encoding: quoted-printable Content-Description: 0001-libtoolize.patch From=20145273418d3131bcf3b73d416d19f641645cf3f8 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D Date: Fri, 13 Nov 2020 15:24:46 +0100 Subject: [PATCH] gnu: libtool: Restore shebangs on all libtoolize files. * gnu/packages/autotools.scm (libtool)[restore-build-aux-shebang]: New phase after install. [restore-ltmain-shebang]: Remove phase, it is now performed by the phase restore-build-aux-shebang. =2D-- gnu/packages/autotools.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 96f2925180..c9e1c9bcf1 100644 =2D-- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -444,11 +444,19 @@ Makefile, simplifying the entire process for the deve= loper.") (("/bin/sh") (string-append bash "/bin/sh"))) #t))) =2D (add-after 'patch-source-shebangs 'restore-ltmain-shebang =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "build-aux/ltmain.in" =2D (("^#!.*/bin/sh$") "#!/bin/sh")) =2D #t))))) + ;; These files may be copied into source trees by libtoolize, + ;; therefore they must not point to store file names that would be + ;; leaked with tarballs generated by make dist. + (add-after 'install 'restore-build-aux-shebang + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/libtool/build-aux"))) + (for-each (lambda (file) + (format #t "restoring shebang on `~a'~%" file) + (substitute* file + (("^#!.*/bin/sh") "#!/bin/sh"))) + (find-files dir ".*")) + #t)))))) =20 (synopsis "Generic shared library support tools") (description =2D-=20 2.29.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEiIeExBRZrMuD5+hMY0xuiXn6vsIFAl+upvQACgkQY0xuiXn6 vsJ6Xwv9FvnDwhtr63aPHozMYIOWtLuYZaj531dqkbC3vuZjGv9kM+i2qyRA0PPc 80aIWjB3viuQ5/4yLqD23fCNqkkgDKsFWGFPwKv9Lva1iaFurgskwIdsWDBQkp68 Jn0W+hJrMxqEg41PGXGOjnicVBb349M5ruuc65AtqboOFlx7/ETPcZouKd0oWUn4 89CZEIhjbcKf/DbXe1ouUrZMUKoEbpSU1rMVbtz+14fN2leqWfNFKVHNEnHTP3ho VwMQvLwNwzKa2h4ynoDtjq4w/1Ewg/RzyExRRb2EJUFv37KMB4whE+Qj3TfGMaIa 5mY8N8tc6P8wmuQwr0Y5EE5gykJczjM55+1LsctCFDVTbAuJZZNfhmyQdUeDBJ3B s7QwvYTAddFlEwgpPGUSgTTSb1VlGj95qg9YP2QQFTtT1D0jtIh6gE/LqEeOMHkp aARwBxlEqqLJqQtWnJLQ1rh9Flg+KJYb0+MWC+3H4b+BLAJ7DckGHWHxl99AiYIm B9fHHT7d =Gnea -----END PGP SIGNATURE----- --==-=-=--