diff options
Diffstat (limited to 'gnu/packages/autotools.scm')
| -rw-r--r-- | gnu/packages/autotools.scm | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 238bd6bc11..57efc4c477 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -59,12 +59,9 @@ "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4")))) (build-system gnu-build-system) (inputs - ;; TODO: remove `if' in the next rebuild cycle. - (if (%current-target-system) - `(("bash" ,bash-minimal) - ("perl" ,perl) - ("m4" ,m4)) - '())) + `(("bash" ,bash-minimal) + ("perl" ,perl) + ("m4" ,m4))) (native-inputs `(("perl" ,perl) ("m4" ,m4))) @@ -216,9 +213,9 @@ files with a system-specific shebang." (inputs `(("guile" ;; XXX: Kludge to hide the circular dependency. ,(module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.0)) + 'guile-3.0/fixed)) ("autoconf" ,autoconf) - ("bash" ,bash))) + ("bash" ,bash-minimal))) (arguments '(#:modules ((guix build utils)) #:builder @@ -331,24 +328,21 @@ output is indexed in many ways to simplify browsing.") (define-public automake (package (name "automake") - (version "1.16.2") + (version "1.16.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/automake/automake-" version ".tar.xz")) (sha256 (base32 - "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c")) + "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz")) (patches (search-patches "automake-skip-amhello-tests.patch")))) (build-system gnu-build-system) (inputs - ;; TODO: remove `if' in the next rebuild cycle. - (if (%current-target-system) - `(("autoconf" ,autoconf-wrapper) - ("bash" ,bash-minimal) - ("perl" ,perl)) - '())) + `(("autoconf" ,autoconf-wrapper) + ("bash" ,bash-minimal) + ("perl" ,perl))) (native-inputs `(("autoconf" ,autoconf-wrapper) ("perl" ,perl))) @@ -507,11 +501,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 |