diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-01-07 09:44:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-07 16:48:50 +0100 |
commit | 3246cc91858a18344a6b62272521c88dd0ec5037 (patch) | |
tree | b839dc4d8cc70c29a481271790c2d4ddd584066d /gnu/packages/openldap.scm | |
parent | c154e1ea81b1eb81c5716ce5a4df694fbd05c421 (diff) | |
download | patches-3246cc91858a18344a6b62272521c88dd0ec5037.tar patches-3246cc91858a18344a6b62272521c88dd0ec5037.tar.gz |
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'.
Diffstat (limited to 'gnu/packages/openldap.scm')
-rw-r--r-- | gnu/packages/openldap.scm | 4 |
1 files changed, 2 insertions, 2 deletions
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 <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; ;;; This file is part of GNU Guix. @@ -52,8 +52,8 @@ ;; 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 |