me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Make libtool and libltdl completely separate.

Browse source 
* 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'.
This commit is contained in:
Ludovic Courtès 2015-01-07 09:44:10 +01:00
parent c154e1ea81
commit 3246cc9185
16 changed files with 52 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/apr.scm
View file

@ -48,7 +48,7 @@
'(#:parallel-build? #f '(#:parallel-build? #f
#:parallel-tests? #f)) #:parallel-tests? #f))
(inputs `(("perl" ,perl) (inputs `(("perl" ,perl)
("libtool" ,libtool))) ("libltdl" ,libltdl)))
(home-page "http://apr.apache.org/") (home-page "http://apr.apache.org/")
(synopsis "The Apache Portable Runtime Library") (synopsis "The Apache Portable Runtime Library")
(description (description

15
gnu/packages/autotools.scm
View file

@ -254,16 +254,11 @@ Makefile, simplifying the entire process for the developer.")
("automake" ,automake) ;some tests rely on 'aclocal' ("automake" ,automake) ;some tests rely on 'aclocal'
("autoconf" ,(autoconf-wrapper)))) ;others on 'autom4te' ("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 (arguments
(if (%current-target-system) `(;; Libltdl is provided as a separate package, so don't install it here.
'() ;no `check' phase when cross-building #:configure-flags '("--disable-ltdl-install")
`(;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
;; <http://hydra.gnu.org/build/181662>. ;; <http://hydra.gnu.org/build/181662>.
#:tests? ,(not (string-prefix? "mips64" #:tests? ,(not (string-prefix? "mips64"
(or (%current-target-system) (or (%current-target-system)
@ -283,7 +278,7 @@ Makefile, simplifying the entire process for the developer.")
(substitute* "tests/testsuite" (substitute* "tests/testsuite"
(("/bin/sh") (("/bin/sh")
(string-append bash "/bin/bash"))))) (string-append bash "/bin/bash")))))
%standard-phases)))) %standard-phases)))
(synopsis "Generic shared library support tools") (synopsis "Generic shared library support tools")
(description (description
"GNU Libtool helps in the creation and use of shared libraries, by "GNU Libtool helps in the creation and use of shared libraries, by

3
gnu/packages/fontutils.scm
View file

@ -272,8 +272,7 @@ smooth contours with constant curvature at the spline joins.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)))
("libtool-bin" ,libtool "bin")))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases (alist-cons-before
'configure 'bootstrap 'configure 'bootstrap

4
gnu/packages/global.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -38,7 +38,7 @@
"0j828dg2cjf77rx71cw68jpk7jl119v6nyb0kyvirr5i1860j1fx")))) "0j828dg2cjf77rx71cw68jpk7jl119v6nyb0kyvirr5i1860j1fx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("libtool" ,libtool))) ("libltdl" ,libltdl)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-ncurses=" (list (string-append "--with-ncurses="

4
gnu/packages/gnunet.scm
View file

@ -85,7 +85,7 @@
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libogg" ,libogg) ("libogg" ,libogg)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("libtool" ,libtool) ("libltdl" ,libltdl)
("libvorbis" ,libvorbis) ("libvorbis" ,libvorbis)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
@ -213,7 +213,7 @@ supports HTTPS, HTTPS and GnuTLS.")
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libidn" ,libidn) ("libidn" ,libidn)
("libmicrohttpd" ,libmicrohttpd) ("libmicrohttpd" ,libmicrohttpd)
("libtool" ,libtool) ("libltdl" ,libltdl)
("libunistring" ,libunistring) ("libunistring" ,libunistring)
("openssl" ,openssl) ("openssl" ,openssl)
("opus" ,opus) ("opus" ,opus)

4
gnu/packages/graphviz.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,7 +69,7 @@
("pango" ,pango) ("pango" ,pango)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("libltdl" ,libtool) ("libltdl" ,libltdl)
("libXaw" ,libxaw) ("libXaw" ,libxaw)
("expat" ,expat) ("expat" ,expat)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)

4
gnu/packages/libcanberra.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -52,7 +52,7 @@
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("gstreamer" ,gstreamer) ("gstreamer" ,gstreamer)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("libtool" ,libtool) ("libltdl" ,libltdl)
("libvorbis" ,libvorbis) ("libvorbis" ,libvorbis)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("udev" ,eudev))) ("udev" ,eudev)))

4
gnu/packages/libevent.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -85,7 +85,7 @@ loop.")
#:tests? #f)) #:tests? #f))
(native-inputs `(("autoconf" ,(autoconf-wrapper)) (native-inputs `(("autoconf" ,(autoconf-wrapper))
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool "bin") ("libtool" ,libtool)
;; libuv.pc is installed only when pkg-config is found. ;; libuv.pc is installed only when pkg-config is found.
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))

6
gnu/packages/mail.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
@ -113,7 +113,7 @@
("readline" ,readline-6.2) ("readline" ,readline-6.2)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("libtool" ,libtool) ("libltdl" ,libltdl)
("gdbm" ,gdbm))) ("gdbm" ,gdbm)))
(home-page "http://www.gnu.org/software/mailutils/") (home-page "http://www.gnu.org/software/mailutils/")
(synopsis "Utilities and library for reading and serving mail") (synopsis "Utilities and library for reading and serving mail")
@ -419,7 +419,7 @@ useful features.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("autoconf" ,(autoconf-wrapper)) (native-inputs `(("autoconf" ,(autoconf-wrapper))
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool "bin") ("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
;; 'libetpan-config --libs' returns '-lssl -lcrypto -lsasl2', so these ;; 'libetpan-config --libs' returns '-lssl -lcrypto -lsasl2', so these

4
gnu/packages/mp3.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -231,7 +231,7 @@ pre-defined or user-specifiable output format.")
(inputs `(("libid3tag" ,libid3tag) (inputs `(("libid3tag" ,libid3tag)
("libmad" ,libmad) ("libmad" ,libmad)
("libogg" ,libogg) ("libogg" ,libogg)
("libtool" ,libtool) ("libltdl" ,libltdl)
("libvorbid" ,libvorbis) ("libvorbid" ,libvorbis)
("pcre" ,pcre))) ("pcre" ,pcre)))
(native-inputs (native-inputs

4
gnu/packages/openldap.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -52,8 +52,8 @@
;; FIXME: currently, openldap requires openssl or gnutls<3, see ;; FIXME: currently, openldap requires openssl or gnutls<3, see
;; http://www.openldap.org/its/index.cgi/Incoming?id=7430;page=17 ;; http://www.openldap.org/its/index.cgi/Incoming?id=7430;page=17
;; Once this is fixed, switch to gnutls. ;; Once this is fixed, switch to gnutls.
("libtool" ,libtool "bin")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs `(("libtool" ,libtool)))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases

4
gnu/packages/photo.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -64,7 +64,7 @@ data as produced by digital cameras.")
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(;; ("libjpeg-turbo" ,libjpeg-turbo) `(;; ("libjpeg-turbo" ,libjpeg-turbo)
("libtool" ,libtool) ("libltdl" ,libltdl)
("libusb" ,libusb))) ("libusb" ,libusb)))
(propagated-inputs (propagated-inputs
`(;; The .pc refers to libexif. `(;; The .pc refers to libexif.

6
gnu/packages/pulseaudio.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -24,7 +24,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #: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 avahi)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages gdbm) #:use-module (gnu packages gdbm)
@ -157,7 +157,7 @@ rates. ")
("intltool" ,intltool) ("intltool" ,intltool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("m4" ,m4) ("m4" ,m4)
("libtool" ,libtool) ("libltdl" ,libltdl)
("fftwf" ,fftwf) ("fftwf" ,fftwf)
("avahi" ,avahi) ("avahi" ,avahi)
("check" ,check))) ("check" ,check)))

2
gnu/packages/ssh.scm
View file

@ -226,7 +226,7 @@ Additionally, various channel-specific options can be negotiated.")
#:parallel-tests? #f)) #:parallel-tests? #f))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool "bin") ("libtool" ,libtool)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which))) ("which" ,which)))

5
gnu/packages/web.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de>
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -231,8 +231,7 @@ for efficient socket-like bidirectional reliable communication channels.")
("automake" ,automake) ("automake" ,automake)
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)
("which" ,which) ("which" ,which)
("libtool" ,libtool) ("libtool" ,libtool)))
("libtool" ,libtool "bin")))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases (alist-cons-before
'bootstrap 'fix-autogen-shebang 'bootstrap 'fix-autogen-shebang

6
gnu/packages/weechat.scm
View file

@ -58,12 +58,12 @@
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("file" ,file) ("file" ,file)
("autogen" ,autogen) ("autogen" ,autogen)
("automake" ,automake))) ("automake" ,automake)
("libtool" ,libtool)))
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
("diffutils" ,diffutils) ("diffutils" ,diffutils)
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)
("libtool" ,libtool "bin") ("libltdl" ,libltdl)
("libtool" ,libtool "out")
("libgcrypt" ,libgcrypt "out") ("libgcrypt" ,libgcrypt "out")
("zlib" ,zlib) ("zlib" ,zlib)
("aspell" ,aspell) ("aspell" ,aspell)