From af07095516b56dcdd38bf1874da27de9c4c841f6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 27 Dec 2014 23:22:08 +0100 Subject: packages: Add 'file-type' field to 'search-path-specification'. Fixes . * guix/packages.scm (): Rename 'directories' field to 'files'. Add 'file-type'. (search-path-specification->sexp): Honor 'file-type'. * gnu/packages/autotools.scm, gnu/packages/bootstrap.scm, gnu/packages/cross-base.scm, gnu/packages/games.scm, gnu/packages/gcc.scm, gnu/packages/glib.scm, gnu/packages/guile.scm, gnu/packages/man.scm, gnu/packages/perl.scm, gnu/packages/pkg-config.scm, gnu/packages/python.scm, gnu/packages/ruby.scm, gnu/packages/xfce.scm: Change 'directories' to 'files'. * tests/packages.scm ("search paths"): Change 'directories' field to 'files'. * guix/scripts/environment.scm (for-each-search-path): Likewise. --- gnu/packages/autotools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 0094577210..a3afcdcfff 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -178,7 +178,7 @@ (define-public automake (native-search-paths (list (search-path-specification (variable "ACLOCAL_PATH") - (directories '("share/aclocal"))))) + (files '("share/aclocal"))))) (arguments '(#:modules ((guix build gnu-build-system) (guix build utils) -- cgit v1.2.3 From 5d65ad80b542e223c540250c27645e05239a0f33 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Jan 2015 22:58:26 +0100 Subject: gnu: libtool: Use 'parallel-job-count' to get the argument for '-j'. * gnu/packages/autotools.scm (libtool)[arguments] : Use (parallel-job-count) instead of hand-written code. --- gnu/packages/autotools.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 427c6e3113..4723d27c47 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -266,17 +266,10 @@ (define-public libtool 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) ;; Run the test suite in parallel, if possible. - (let ((ncores - (cond - ((getenv "NIX_BUILD_CORES") - => - (lambda (n) - (if (zero? (string->number n)) - (number->string (current-processor-count)) - n))) - (else "1")))) - (setenv "TESTSUITEFLAGS" - (string-append "-j" ncores))) + (setenv "TESTSUITEFLAGS" + (string-append + "-j" + (number->string (parallel-job-count)))) ;; Path references to /bin/sh. (let ((bash (assoc-ref inputs "bash"))) -- cgit v1.2.3 From 3cbb3f9c55290ba151df3d3bbb78c83cef7cf6c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Jan 2015 23:12:05 +0100 Subject: gnu: libtool: Add libltdl as a separate package. * gnu/packages/autotools.scm (libltdl): New variable. --- gnu/packages/autotools.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 4723d27c47..eb33009d83 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -310,3 +310,26 @@ (define-public libtool-2.4.4 `(#:tests? #f ,@(package-arguments libtool)) (package-arguments libtool))))) + +(define-public libltdl + ;; This is a libltdl package separate from the libtool package. This is + ;; useful because, unlike libtool, it has zero extra dependencies (making it + ;; readily usable during bootstrap), and it builds very quickly since + ;; Libtool's extensive test suite isn't run. + (package + (name "libltdl") + (version (package-version libtool)) + (source (package-source libtool)) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-ltdl-install") ;really install it + #:phases (alist-cons-before + 'configure 'change-directory + (lambda _ + (chdir "libltdl")) + %standard-phases))) + + (synopsis "System-independent dlopen wrapper of GNU libtool") + (description (package-description libtool)) + (home-page (package-home-page libtool)) + (license lgpl2.1+))) -- cgit v1.2.3 From c154e1ea81b1eb81c5716ce5a4df694fbd05c421 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Jan 2015 23:22:00 +0100 Subject: gnu: libtool: Update to 2.4.4. * gnu/packages/patches/libtool-2.4-skip-tests.patch: Rename to... * gnu/packages/patches/libtool-skip-tests.patch: ... this. * gnu/packages/patches/libtool-skip-tests-for-mips.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/autotools.scm (libtool): Update to 2.4.4. (libtool-2.4.4): Remove. --- gnu-system.am | 2 - gnu/packages/autotools.scm | 63 ++++++++-------------- gnu/packages/patches/libtool-2.4-skip-tests.patch | 24 --------- .../patches/libtool-skip-tests-for-mips.patch | 12 ----- gnu/packages/patches/libtool-skip-tests.patch | 53 +++++++----------- 5 files changed, 42 insertions(+), 112 deletions(-) delete mode 100644 gnu/packages/patches/libtool-2.4-skip-tests.patch delete mode 100644 gnu/packages/patches/libtool-skip-tests-for-mips.patch (limited to 'gnu/packages/autotools.scm') diff --git a/gnu-system.am b/gnu-system.am index 5dd3a4937e..03b4134019 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -407,8 +407,6 @@ dist_patch_DATA = \ gnu/packages/patches/libmad-mips-newgcc.patch \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests.patch \ - gnu/packages/patches/libtool-skip-tests-for-mips.patch \ - gnu/packages/patches/libtool-2.4-skip-tests.patch \ gnu/packages/patches/libssh-CVE-2014-0017.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ gnu/packages/patches/luit-posix.patch \ diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index eb33009d83..0ee1d149b9 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -238,31 +238,38 @@ (define (starts-with-shebang? file) (define-public libtool (package (name "libtool") - (version "2.4.2") + (version "2.4.4") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/libtool/libtool-" - version ".tar.gz")) - (sha256 - (base32 - "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk")) - (patches - (list (search-patch "libtool-skip-tests.patch") - (search-patch "libtool-skip-tests-for-mips.patch"))))) + (method url-fetch) + (uri (string-append "mirror://gnu/libtool/libtool-" + version ".tar.xz")) + (sha256 + (base32 + "0v3zq08qxv7k5067mpqrkjkjl3wphhg06i696mka90mzadc5nad8")) + (patches + (list (search-patch "libtool-skip-tests.patch"))))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4) - ("perl" ,perl))) + ("perl" ,perl) + ("automake" ,automake) ;some tests rely on 'aclocal' + ("autoconf" ,(autoconf-wrapper)))) ;others on 'autom4te' ;; Separate binaries from the rest. During bootstrap, only ltdl is ;; used; not depending on the binaries allows us to avoid retaining ;; a reference to the bootstrap bash. - (outputs '("bin" ; libtoolize, libtool, etc. - "out")) ; libltdl.so, ltdl.h, etc. + (outputs '("bin" ;libtoolize, libtool, etc. + "out")) ;libltdl.so, ltdl.h, etc. (arguments (if (%current-target-system) - '() ; no `check' phase when cross-building - '(#:phases (alist-cons-before + '() ;no `check' phase when cross-building + `(;; XXX: There are test failures on mips64el-linux starting from 2.4.4: + ;; . + #:tests? ,(not (string-prefix? "mips64" + (or (%current-target-system) + (%current-system)))) + + #:phases (alist-cons-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) ;; Run the test suite in parallel, if possible. @@ -285,32 +292,6 @@ (define-public libtool (license gpl3+) (home-page "http://www.gnu.org/software/libtool/"))) -(define-public libtool-2.4.4 - (package (inherit libtool) - (version "2.4.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/libtool/libtool-" - version ".tar.xz")) - (sha256 - (base32 - "0v3zq08qxv7k5067mpqrkjkjl3wphhg06i696mka90mzadc5nad8")) - (patches - (list (search-patch "libtool-2.4-skip-tests.patch"))))) - - (native-inputs `(("automake" ,automake) ;some tests rely on 'aclocal' - ("autoconf" ,(autoconf-wrapper)) ;others on 'autom4te' - ,@(package-native-inputs libtool))) - - (arguments - ;; XXX: There are test failures on mips64el-linux starting from 2.4.4: - ;; . - (if (string-prefix? "mips64el" - (or (%current-target-system) (%current-system))) - `(#:tests? #f - ,@(package-arguments libtool)) - (package-arguments libtool))))) - (define-public libltdl ;; This is a libltdl package separate from the libtool package. This is ;; useful because, unlike libtool, it has zero extra dependencies (making it diff --git a/gnu/packages/patches/libtool-2.4-skip-tests.patch b/gnu/packages/patches/libtool-2.4-skip-tests.patch deleted file mode 100644 index 95747dfef0..0000000000 --- a/gnu/packages/patches/libtool-2.4-skip-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -Because our GCC 'lib' spec automatically adds '-rpath' for each '-L' -and a couple more '-rpath, there are two test failures: -one in demo.test, and one in destdir.at. Disable these. - ---- libtool-2.4.4/tests/testsuite 2014-11-29 17:43:11.000000000 +0100 -+++ libtool-2.4.4/tests/testsuite 2015-01-03 23:00:09.367775122 +0100 -@@ -9185,7 +9185,7 @@ read at_status <"$at_status_file" - #AT_START_33 - at_fn_group_banner 33 'demo.at:548' \ - "hardcoding library path" " " 3 --at_xfail=no -+at_xfail=yes - test no = "$ACLOCAL" && at_xfail=yes - test no = "$AUTOHEADER" && at_xfail=yes - test no = "$AUTOMAKE" && at_xfail=yes -@@ -27052,7 +27052,7 @@ read at_status <"$at_status_file" - #AT_START_97 - at_fn_group_banner 97 'destdir.at:75' \ - "DESTDIR with in-package deplibs" " " 7 --at_xfail=no -+at_xfail=yes - eval `$LIBTOOL --config | $GREP '^fast_install='` - case $fast_install in no) :;; *) false;; esac && at_xfail=yes - ( diff --git a/gnu/packages/patches/libtool-skip-tests-for-mips.patch b/gnu/packages/patches/libtool-skip-tests-for-mips.patch deleted file mode 100644 index 36587d23c2..0000000000 --- a/gnu/packages/patches/libtool-skip-tests-for-mips.patch +++ /dev/null @@ -1,12 +0,0 @@ -TEMPORARY HACK: Disable a test that fails on MIPS. - ---- libtool/Makefile.in.orig 2011-10-17 06:18:55.000000000 -0400 -+++ libtool/Makefile.in 2013-10-12 20:41:50.669067382 -0400 -@@ -890,7 +890,6 @@ - tests/demo-pic-make.test \ - tests/demo-pic-exec.test \ - tests/demo-nopic.test \ -- tests/demo-nopic-make.test \ - tests/demo-nopic-exec.test \ - tests/cdemo-shared.test \ - tests/cdemo-shared-make.test \ diff --git a/gnu/packages/patches/libtool-skip-tests.patch b/gnu/packages/patches/libtool-skip-tests.patch index 6e12615d51..95747dfef0 100644 --- a/gnu/packages/patches/libtool-skip-tests.patch +++ b/gnu/packages/patches/libtool-skip-tests.patch @@ -1,37 +1,24 @@ -Because our GCC `lib' spec automatically adds `-rpath' for each `-L' -and a couple more `-rpath, there are two test failures: -demo-hardcode.test, and destdir.at. Disable these. +Because our GCC 'lib' spec automatically adds '-rpath' for each '-L' +and a couple more '-rpath, there are two test failures: +one in demo.test, and one in destdir.at. Disable these. ---- libtool-2.4.2/Makefile.in 2011-10-17 12:18:55.000000000 +0200 -+++ libtool-2.4.2/Makefile.in 2012-09-13 23:50:37.000000000 +0200 -@@ -909,7 +908,7 @@ COMMON_TESTS = \ - # but they depend on the other tests being run beforehand. - INTERACTIVE_TESTS = tests/demo-shared.test tests/demo-shared-make.test \ - tests/demo-shared-exec.test tests/demo-shared-inst.test \ -- tests/demo-hardcode.test tests/demo-relink.test \ -+ tests/demo-relink.test \ - tests/demo-noinst-link.test tests/demo-shared-unst.test \ - tests/depdemo-shared.test tests/depdemo-shared-make.test \ - tests/depdemo-shared-exec.test tests/depdemo-shared-inst.test \ -@@ -2580,8 +2579,7 @@ tests/cdemo-static-make.log: tests/cdemo - - tests/demo-shared-unst.log: tests/demo-noinst-link.log - tests/demo-noinst-link.log: tests/demo-relink.log --tests/demo-relink.log: tests/demo-hardcode.log --tests/demo-hardcode.log: tests/demo-shared-inst.log -+tests/demo-relink.log: tests/demo-shared-inst.log - tests/demo-shared-inst.log: tests/demo-shared-exec.log - tests/demo-shared-exec.log: tests/demo-shared-make.log - tests/demo-shared-make.log: tests/demo-shared.log - ---- libtool-2.4.2/tests/testsuite 2011-10-17 12:19:52.000000000 +0200 -+++ libtool-2.4.2/tests/testsuite 2012-09-14 00:28:45.000000000 +0200 -@@ -14443,6 +14443,6 @@ read at_status <"$at_status_file" - #AT_START_69 - at_fn_group_banner 69 'destdir.at:75' \ - "DESTDIR with in-package deplibs" " " 4 +--- libtool-2.4.4/tests/testsuite 2014-11-29 17:43:11.000000000 +0100 ++++ libtool-2.4.4/tests/testsuite 2015-01-03 23:00:09.367775122 +0100 +@@ -9185,7 +9185,7 @@ read at_status <"$at_status_file" + #AT_START_33 + at_fn_group_banner 33 'demo.at:548' \ + "hardcoding library path" " " 3 +-at_xfail=no ++at_xfail=yes + test no = "$ACLOCAL" && at_xfail=yes + test no = "$AUTOHEADER" && at_xfail=yes + test no = "$AUTOMAKE" && at_xfail=yes +@@ -27052,7 +27052,7 @@ read at_status <"$at_status_file" + #AT_START_97 + at_fn_group_banner 97 'destdir.at:75' \ + "DESTDIR with in-package deplibs" " " 7 -at_xfail=no +at_xfail=yes - eval `$LIBTOOL --config | grep '^fast_install='` + eval `$LIBTOOL --config | $GREP '^fast_install='` case $fast_install in no) :;; *) false;; esac && at_xfail=yes - + ( -- cgit v1.2.3 From 3246cc91858a18344a6b62272521c88dd0ec5037 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 7 Jan 2015 09:44:10 +0100 Subject: gnu: Make libtool and libltdl completely separate. * gnu/packages/autotools.scm (libtool)[outputs]: Remove. [arguments]: Remove 'if' around arguments. Add #:configure-flags. * gnu/packages/apr.scm (apr)[inputs]: Change libtool to libltdl. * gnu/packages/fontutils.scm (libuninameslist)[native-inputs]: Remove "libtool-bin". * gnu/packages/global.scm (global): Change libtool to libltdl. * gnu/packages/gnunet.scm (libextractor, gnunet): Likewise. * gnu/packages/graphviz.scm (graphviz): Likewise. * gnu/packages/libcanberra.scm (libcanberra): Likewise. * gnu/packages/libevent.scm (libuv)[native-inputs]: Remove "bin" part for libtool. * gnu/packages/mail.scm (mailutils): Change libtool to libltdl. (libetpan): Remove "bin" part for libtool. * gnu/packages/mp3.scm (libmp3splt): Change libtool to libltdl. * gnu/packages/openldap.scm (openldap): Remove "bin" part of libtool. Move it from 'inputs' to 'native-inputs'. * gnu/packages/photo.scm (libgphoto2): Change libtool to libltdl. * gnu/packages/pulseaudio.scm (pulseaudio): Likewise. * gnu/packages/ssh.scm (guile-ssh): Remove "bin" part of libtool. * gnu/packages/web.scm (libpsl): Likewise. * gnu/packages/weechat.scm (weechat): Move libtool to 'native-inputs' and add libltdl to 'inputs'. --- gnu/packages/apr.scm | 2 +- gnu/packages/autotools.scm | 49 ++++++++++++++++++++------------------------ gnu/packages/fontutils.scm | 3 +-- gnu/packages/global.scm | 4 ++-- gnu/packages/gnunet.scm | 4 ++-- gnu/packages/graphviz.scm | 4 ++-- gnu/packages/libcanberra.scm | 4 ++-- gnu/packages/libevent.scm | 4 ++-- gnu/packages/mail.scm | 6 +++--- gnu/packages/mp3.scm | 4 ++-- gnu/packages/openldap.scm | 4 ++-- gnu/packages/photo.scm | 4 ++-- gnu/packages/pulseaudio.scm | 6 +++--- gnu/packages/ssh.scm | 2 +- gnu/packages/web.scm | 5 ++--- gnu/packages/weechat.scm | 6 +++--- 16 files changed, 52 insertions(+), 59 deletions(-) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index cedeea8a14..3e53a614fc 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -48,7 +48,7 @@ (define-public apr '(#:parallel-build? #f #:parallel-tests? #f)) (inputs `(("perl" ,perl) - ("libtool" ,libtool))) + ("libltdl" ,libltdl))) (home-page "http://apr.apache.org/") (synopsis "The Apache Portable Runtime Library") (description diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 0ee1d149b9..07fdde73ea 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -254,36 +254,31 @@ (define-public libtool ("automake" ,automake) ;some tests rely on 'aclocal' ("autoconf" ,(autoconf-wrapper)))) ;others on 'autom4te' - ;; Separate binaries from the rest. During bootstrap, only ltdl is - ;; used; not depending on the binaries allows us to avoid retaining - ;; a reference to the bootstrap bash. - (outputs '("bin" ;libtoolize, libtool, etc. - "out")) ;libltdl.so, ltdl.h, etc. - (arguments - (if (%current-target-system) - '() ;no `check' phase when cross-building - `(;; XXX: There are test failures on mips64el-linux starting from 2.4.4: - ;; . - #:tests? ,(not (string-prefix? "mips64" - (or (%current-target-system) - (%current-system)))) + `(;; Libltdl is provided as a separate package, so don't install it here. + #:configure-flags '("--disable-ltdl-install") + + ;; XXX: There are test failures on mips64el-linux starting from 2.4.4: + ;; . + #:tests? ,(not (string-prefix? "mips64" + (or (%current-target-system) + (%current-system)))) - #:phases (alist-cons-before - 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - ;; Run the test suite in parallel, if possible. - (setenv "TESTSUITEFLAGS" - (string-append - "-j" - (number->string (parallel-job-count)))) + #:phases (alist-cons-before + 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Run the test suite in parallel, if possible. + (setenv "TESTSUITEFLAGS" + (string-append + "-j" + (number->string (parallel-job-count)))) - ;; Path references to /bin/sh. - (let ((bash (assoc-ref inputs "bash"))) - (substitute* "tests/testsuite" - (("/bin/sh") - (string-append bash "/bin/bash"))))) - %standard-phases)))) + ;; Path references to /bin/sh. + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "tests/testsuite" + (("/bin/sh") + (string-append bash "/bin/bash"))))) + %standard-phases))) (synopsis "Generic shared library support tools") (description "GNU Libtool helps in the creation and use of shared libraries, by diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a4da6df553..f98625cdae 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -272,8 +272,7 @@ (define-public libuninameslist (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("libtool" ,libtool) - ("libtool-bin" ,libtool "bin"))) + ("libtool" ,libtool))) (arguments `(#:phases (alist-cons-before 'configure 'bootstrap diff --git a/gnu/packages/global.scm b/gnu/packages/global.scm index f7377def0a..72a53ad4a8 100644 --- a/gnu/packages/global.scm +++ b/gnu/packages/global.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +38,7 @@ (define-public global ; a global variable "0j828dg2cjf77rx71cw68jpk7jl119v6nyb0kyvirr5i1860j1fx")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) - ("libtool" ,libtool))) + ("libltdl" ,libltdl))) (arguments `(#:configure-flags (list (string-append "--with-ncurses=" diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 249971becd..f7063ead11 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -85,7 +85,7 @@ (define-public libextractor ("libjpeg" ,libjpeg) ("libogg" ,libogg) ("libtiff" ,libtiff) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("libvorbis" ,libvorbis) ("zlib" ,zlib))) (native-inputs @@ -213,7 +213,7 @@ (define-public gnunet ("libgcrypt" ,libgcrypt) ("libidn" ,libidn) ("libmicrohttpd" ,libmicrohttpd) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("libunistring" ,libunistring) ("openssl" ,openssl) ("opus" ,opus) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index dc477f30b3..52522af446 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,7 +69,7 @@ (define-public graphviz ("pango" ,pango) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("libltdl" ,libtool) + ("libltdl" ,libltdl) ("libXaw" ,libxaw) ("expat" ,expat) ("libjpeg" ,libjpeg) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 764c3272a2..859740aaee 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +52,7 @@ (define-public libcanberra `(("alsa-lib" ,alsa-lib) ("gstreamer" ,gstreamer) ("gtk+" ,gtk+) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("libvorbis" ,libvorbis) ("pulseaudio" ,pulseaudio) ("udev" ,eudev))) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 27416a0e59..64892bf878 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,7 +85,7 @@ (define-public libuv #:tests? #f)) (native-inputs `(("autoconf" ,(autoconf-wrapper)) ("automake" ,automake) - ("libtool" ,libtool "bin") + ("libtool" ,libtool) ;; libuv.pc is installed only when pkg-config is found. ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8424d8ccbe..62f86ef839 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014 Sou Bunnbu @@ -113,7 +113,7 @@ (define-public mailutils ("readline" ,readline-6.2) ("linux-pam" ,linux-pam) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("gdbm" ,gdbm))) (home-page "http://www.gnu.org/software/mailutils/") (synopsis "Utilities and library for reading and serving mail") @@ -419,7 +419,7 @@ (define-public libetpan (build-system gnu-build-system) (native-inputs `(("autoconf" ,(autoconf-wrapper)) ("automake" ,automake) - ("libtool" ,libtool "bin") + ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (propagated-inputs ;; 'libetpan-config --libs' returns '-lssl -lcrypto -lsasl2', so these diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 1731cd59af..55ab4b497c 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -231,7 +231,7 @@ (define-public libmp3splt (inputs `(("libid3tag" ,libid3tag) ("libmad" ,libmad) ("libogg" ,libogg) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("libvorbid" ,libvorbis) ("pcre" ,pcre))) (native-inputs diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 23c32488e9..a6c4cb0d93 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; ;;; This file is part of GNU Guix. @@ -52,8 +52,8 @@ (define-public openldap ;; FIXME: currently, openldap requires openssl or gnutls<3, see ;; http://www.openldap.org/its/index.cgi/Incoming?id=7430;page=17 ;; Once this is fixed, switch to gnutls. - ("libtool" ,libtool "bin") ("zlib" ,zlib))) + (native-inputs `(("libtool" ,libtool))) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4f1787fe75..164f6e27ea 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,7 +64,7 @@ (define-public libgphoto2 (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(;; ("libjpeg-turbo" ,libjpeg-turbo) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("libusb" ,libusb))) (propagated-inputs `(;; The .pc refers to libexif. diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 61e0d029f5..1e9fe41b47 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -24,7 +24,7 @@ (define-module (gnu packages pulseaudio) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages algebra) - #:use-module ((gnu packages autotools) #:select (libtool)) + #:use-module ((gnu packages autotools) #:select (libltdl)) #:use-module (gnu packages avahi) #:use-module (gnu packages check) #:use-module (gnu packages gdbm) @@ -157,7 +157,7 @@ (define pulseaudio ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("m4" ,m4) - ("libtool" ,libtool) + ("libltdl" ,libltdl) ("fftwf" ,fftwf) ("avahi" ,avahi) ("check" ,check))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c39d5f82be..79e8077cdf 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -226,7 +226,7 @@ (define-public guile-ssh #:parallel-tests? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("libtool" ,libtool "bin") + ("libtool" ,libtool) ("texinfo" ,texinfo) ("pkg-config" ,pkg-config) ("which" ,which))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8a64211697..554f2a3ae4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -231,8 +231,7 @@ (define-public libpsl ("automake" ,automake) ("gettext" ,gnu-gettext) ("which" ,which) - ("libtool" ,libtool) - ("libtool" ,libtool "bin"))) + ("libtool" ,libtool))) (arguments `(#:phases (alist-cons-before 'bootstrap 'fix-autogen-shebang diff --git a/gnu/packages/weechat.scm b/gnu/packages/weechat.scm index 5555601d47..a2e53481c3 100644 --- a/gnu/packages/weechat.scm +++ b/gnu/packages/weechat.scm @@ -58,12 +58,12 @@ (define-public weechat ("pkg-config" ,pkg-config) ("file" ,file) ("autogen" ,autogen) - ("automake" ,automake))) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("ncurses" ,ncurses) ("diffutils" ,diffutils) ("gettext" ,gnu-gettext) - ("libtool" ,libtool "bin") - ("libtool" ,libtool "out") + ("libltdl" ,libltdl) ("libgcrypt" ,libgcrypt "out") ("zlib" ,zlib) ("aspell" ,aspell) -- cgit v1.2.3 From 62c155c0bcbc0d71b1bc35e966193b6e8de03246 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 10 Jan 2015 19:14:29 -0500 Subject: gnu: libtool: Add m4 to propagated-inputs. * gnu/packages/autotools.scm (libtool)[propagated-inputs]: Add m4. --- gnu/packages/autotools.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 07fdde73ea..8e72562444 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -249,6 +249,7 @@ (define-public libtool (patches (list (search-patch "libtool-skip-tests.patch"))))) (build-system gnu-build-system) + (propagated-inputs `(("m4" ,m4))) (native-inputs `(("m4" ,m4) ("perl" ,perl) ("automake" ,automake) ;some tests rely on 'aclocal' -- cgit v1.2.3