branch core-updates updated: gnu: libtool: Restore shebangs on all libtoolize files.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

m1gu3l pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 8d263ff  gnu: libtool: Restore shebangs on all libtoolize files.
8d263ff is described below

commit 8d263ff254292c9e13a9848f90b52263da52d570
Author: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
AuthorDate: Fri Nov 13 15:24:46 2020 +0100

    gnu: libtool: Restore shebangs on all libtoolize files.
    
    Fixes <https://bugs.gnu.org/25304>.
    
    * 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.
---
 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 96f2925..c9e1c9b 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -444,11 +444,19 @@ Makefile, simplifying the entire process for the 
developer.")
                (("/bin/sh")
                 (string-append bash "/bin/sh")))
              #t)))
-         (add-after 'patch-source-shebangs 'restore-ltmain-shebang
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "build-aux/ltmain.in"
-               (("^#!.*/bin/sh$") "#!/bin/sh"))
-             #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))))))
 
     (synopsis "Generic shared library support tools")
     (description