Libtool: version 'develop' (#8894)

* libtool: add version 'develop'.

* libtool: patch: correct parsing of compiler output when collecting predeps and postdeps.
This commit is contained in:
Sergey Kosukhin 2018-08-06 17:43:26 +02:00 committed by Adam J. Stewart
parent 3fc1a65867
commit 7cc11debdd
2 changed files with 34 additions and 0 deletions

View file

@ -0,0 +1,19 @@
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b55a6e57..26febc87 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -7557,10 +7557,11 @@ if AC_TRY_EVAL(ac_compile); then
case $prev$p in
-L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
+ # Some compilers place space between "-{L,R,l}" and the path (value).
# Remove the space.
- if test x-L = "$p" ||
- test x-R = "$p"; then
+ if test x-L = x"$p" ||
+ test x-R = x"$p" ||
+ test x-l = x"$p"; then
prev=$p
continue
fi

View file

@ -31,13 +31,28 @@ class Libtool(AutotoolsPackage):
homepage = 'https://www.gnu.org/software/libtool/' homepage = 'https://www.gnu.org/software/libtool/'
url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz' url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz'
version('develop', git='https://git.savannah.gnu.org/git/libtool.git',
branch='master')
version('2.4.6', 'addf44b646ddb4e3919805aa88fa7c5e') version('2.4.6', 'addf44b646ddb4e3919805aa88fa7c5e')
version('2.4.2', 'd2f3b7d4627e69e13514a40e72a24d50') version('2.4.2', 'd2f3b7d4627e69e13514a40e72a24d50')
depends_on('m4@1.4.6:', type='build') depends_on('m4@1.4.6:', type='build')
depends_on('autoconf', type='build', when='@develop')
depends_on('automake', type='build', when='@develop')
depends_on('help2man', type='build', when='@develop')
depends_on('xz', type='build', when='@develop')
depends_on('texinfo', type='build', when='@develop')
# Fix parsing of compiler output when collecting predeps and postdeps
# http://lists.gnu.org/archive/html/bug-libtool/2016-03/msg00003.html
patch('flag_space.patch', when='@develop')
build_directory = 'spack-build' build_directory = 'spack-build'
@when('@develop')
def autoreconf(self, spec, prefix):
Executable('./bootstrap')()
def _make_executable(self, name): def _make_executable(self, name):
return Executable(join_path(self.prefix.bin, name)) return Executable(join_path(self.prefix.bin, name))