guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: libtool: Restore ltmain.sh shebang.


From: Leo Famulari
Subject: 02/03: gnu: libtool: Restore ltmain.sh shebang.
Date: Thu, 5 Jan 2017 15:43:36 +0000 (UTC)

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

commit 98341757c8c45fca8d2b53f9972f5c6a32cf2c95
Author: ng0 <address@hidden>
Date:   Sun Jan 1 15:24:28 2017 +0000

    gnu: libtool: Restore ltmain.sh shebang.
    
    This fixes <http://bugs.gnu.org/25304>
    
    * gnu/packages/autotools.scm (libtool)[arguments]: Add new phase
    'restore-ltmain-shebang'.
    [native-inputs]: Add help2man.
    
    Signed-off-by: Leo Famulari <address@hidden>
---
 gnu/packages/autotools.scm |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 16ab2b8..83018ca 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages m4)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages bash)
   #:use-module (guix utils)
   #:use-module (guix packages)
@@ -301,6 +302,7 @@ Makefile, simplifying the entire process for the 
developer.")
     (propagated-inputs `(("m4" ,m4)))
     (native-inputs `(("m4" ,m4)
                      ("perl" ,perl)
+                     ("help2man" ,help2man) ;because we modify ltmain.sh
                      ("automake" ,automake)      ;some tests rely on 'aclocal'
                      ("autoconf" ,(autoconf-wrapper)))) ;others on 'autom4te'
 
@@ -328,6 +330,10 @@ Makefile, simplifying the entire process for the 
developer.")
              (substitute* "tests/testsuite"
                (("/bin/sh")
                 (string-append bash "/bin/bash")))))))))
+         (add-after 'patch-source-shebangs 'restore-ltmain-shebang
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "build-aux/ltmain.in"
+               (("^#!.*/bin/sh$") "/bin/sh")))))))
 
     (synopsis "Generic shared library support tools")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]