diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-05-26 20:50:05 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-05-28 22:01:09 +0300 |
| commit | 1da2834720c99c3707d17e4bf12e409b1a374b29 (patch) | |
| tree | d7ad6c30e0f4a7b944cc4586d502f30731970278 /gnu/packages/autotools.scm | |
| parent | 3acb615a3828207d55f52873b669c6917a16e10d (diff) | |
gnu: libtool and libltdl: Update to 2.4.7.
* gnu/packages/autotools.scm (libtool, libltdl): Update to 2.4.7.
[arguments]: Remove trailing #t from phases. Remove unnecessary file
field from find-files.
(libltdl)[arguments]: Remove trailing #t.
* gnu/packages/patches/libtool-skip-tests2.patch: Update patch.
Diffstat (limited to 'gnu/packages/autotools.scm')
| -rw-r--r-- | gnu/packages/autotools.scm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 0c3152d7f8c..a46ac092288 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org> | 6 | ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <mhw@netris.org> |
| 7 | ;;; Copyright © 2016 David Thompson <davet@gnu.org> | 7 | ;;; Copyright © 2016 David Thompson <davet@gnu.org> |
| 8 | ;;; Copyright © 2017 Nikita <nikita@n0.is> | 8 | ;;; Copyright © 2017 Nikita <nikita@n0.is> |
| 9 | ;;; Copyright © 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> | 9 | ;;; Copyright © 2017, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> |
| 10 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 10 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| 11 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> | 11 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> |
| 12 | ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> | 12 | ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> |
| @@ -451,14 +451,14 @@ Makefile, simplifying the entire process for the developer.") | |||
| 451 | (define-public libtool | 451 | (define-public libtool |
| 452 | (package | 452 | (package |
| 453 | (name "libtool") | 453 | (name "libtool") |
| 454 | (version "2.4.6") | 454 | (version "2.4.7") |
| 455 | (source (origin | 455 | (source (origin |
| 456 | (method url-fetch) | 456 | (method url-fetch) |
| 457 | (uri (string-append "mirror://gnu/libtool/libtool-" | 457 | (uri (string-append "mirror://gnu/libtool/libtool-" |
| 458 | version ".tar.xz")) | 458 | version ".tar.xz")) |
| 459 | (sha256 | 459 | (sha256 |
| 460 | (base32 | 460 | (base32 |
| 461 | "0vxj52zm709125gwv9qqlw02silj8bnjnh4y07arrz60r31ai1vw")) | 461 | "0pb3l4x37k6fj1lwnpzws55gi3pxl0hx56jm4bzmbrkw0mzj2zsg")) |
| 462 | (patches (search-patches "libtool-skip-tests2.patch")))) | 462 | (patches (search-patches "libtool-skip-tests2.patch")))) |
| 463 | (build-system gnu-build-system) | 463 | (build-system gnu-build-system) |
| 464 | (propagated-inputs (list m4)) | 464 | (propagated-inputs (list m4)) |
| @@ -495,8 +495,7 @@ Makefile, simplifying the entire process for the developer.") | |||
| 495 | (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) | 495 | (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) |
| 496 | (substitute* "tests/testsuite" | 496 | (substitute* "tests/testsuite" |
| 497 | (("/bin/sh") | 497 | (("/bin/sh") |
| 498 | (string-append bash "/bin/sh"))) | 498 | (string-append bash "/bin/sh")))))) |
| 499 | #t))) | ||
| 500 | ;; These files may be copied into source trees by libtoolize, | 499 | ;; These files may be copied into source trees by libtoolize, |
| 501 | ;; therefore they must not point to store file names that would be | 500 | ;; therefore they must not point to store file names that would be |
| 502 | ;; leaked with tarballs generated by make dist. | 501 | ;; leaked with tarballs generated by make dist. |
| @@ -508,8 +507,7 @@ Makefile, simplifying the entire process for the developer.") | |||
| 508 | (format #t "restoring shebang on `~a'~%" file) | 507 | (format #t "restoring shebang on `~a'~%" file) |
| 509 | (substitute* file | 508 | (substitute* file |
| 510 | (("^#!.*/bin/sh") "#!/bin/sh"))) | 509 | (("^#!.*/bin/sh") "#!/bin/sh"))) |
| 511 | (find-files dir ".*")) | 510 | (find-files dir)))))))) |
| 512 | #t)))))) | ||
| 513 | 511 | ||
| 514 | (synopsis "Generic shared library support tools") | 512 | (synopsis "Generic shared library support tools") |
| 515 | (description | 513 | (description |
| @@ -573,20 +571,20 @@ configuration in nearly all GNU packages (and many others).") | |||
| 573 | ;; Libtool's extensive test suite isn't run. | 571 | ;; Libtool's extensive test suite isn't run. |
| 574 | (package | 572 | (package |
| 575 | (name "libltdl") | 573 | (name "libltdl") |
| 576 | (version "2.4.6") | 574 | (version "2.4.7") |
| 577 | (source (origin | 575 | (source (origin |
| 578 | (method url-fetch) | 576 | (method url-fetch) |
| 579 | (uri (string-append "mirror://gnu/libtool/libtool-" | 577 | (uri (string-append "mirror://gnu/libtool/libtool-" |
| 580 | version ".tar.xz")) | 578 | version ".tar.xz")) |
| 581 | (sha256 | 579 | (sha256 |
| 582 | (base32 | 580 | (base32 |
| 583 | "0vxj52zm709125gwv9qqlw02silj8bnjnh4y07arrz60r31ai1vw")))) | 581 | "0pb3l4x37k6fj1lwnpzws55gi3pxl0hx56jm4bzmbrkw0mzj2zsg")))) |
| 584 | (build-system gnu-build-system) | 582 | (build-system gnu-build-system) |
| 585 | (arguments | 583 | (arguments |
| 586 | '(#:configure-flags '("--enable-ltdl-install") ;really install it | 584 | '(#:configure-flags '("--enable-ltdl-install") ;really install it |
| 587 | #:phases (modify-phases %standard-phases | 585 | #:phases (modify-phases %standard-phases |
| 588 | (add-before 'configure 'change-directory | 586 | (add-before 'configure 'change-directory |
| 589 | (lambda _ (chdir "libltdl") #t))))) | 587 | (lambda _ (chdir "libltdl")))))) |
| 590 | 588 | ||
| 591 | (synopsis "System-independent dlopen wrapper of GNU libtool") | 589 | (synopsis "System-independent dlopen wrapper of GNU libtool") |
| 592 | (description (package-description libtool)) | 590 | (description (package-description libtool)) |
