From e13f715be0d609073974b1d464771638887a00c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 3 Jan 2015 23:35:43 +0100 Subject: gnu: libtool: Add 2.4.4. * gnu/packages/patches/libtool-2.4-skip-tests.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/autotools.scm (libtool-2.4.4): New variable. --- gnu/packages/autotools.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 0094577210..3d5c85463f 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; ;;; This file is part of GNU Guix. @@ -291,3 +291,20 @@ presenting a single consistent, portable interface that hides the usual complexity of working with shared libraries across platforms.") (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))))) -- cgit v1.2.3 From ffc200d7e08862355c7381f45ee7dd772c4d8e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Jan 2015 14:52:56 +0100 Subject: gnu: libtool-2.4.4: Disable tests on MIPS. * gnu/packages/autotools.scm (libtool-2.4.4)[arguments]: New field. --- gnu/packages/autotools.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 3d5c85463f..e45f53d927 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -307,4 +307,13 @@ complexity of working with shared libraries across platforms.") (native-inputs `(("automake" ,automake) ;some tests rely on 'aclocal' ("autoconf" ,(autoconf-wrapper)) ;others on 'autom4te' - ,@(package-native-inputs libtool))))) + ,@(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))))) -- cgit v1.2.3 From aebb05b09502be00fb121f9c6cd74a190fb12a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Jan 2015 17:54:25 +0100 Subject: gnu: automake: Update to 1.15. * gnu/packages/autotools.scm (automake): Update to 1.15. --- gnu/packages/autotools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/autotools.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index e45f53d927..3db3f45949 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -161,14 +161,14 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (define-public automake (package (name "automake") - (version "1.14.1") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/automake/automake-" version ".tar.xz")) (sha256 (base32 - "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59")) + "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r")) (patches (list (search-patch "automake-skip-amhello-tests.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3