From bf2cc1e5d14df7d8ff0c9456798d48fba65de317 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sun, 3 Nov 2013 18:15:00 -0500
Subject: [PATCH] gnu: libtool: skip a test that fails on MIPS N32.
* gnu/packages/patches/libtool-skip-tests-for-mips.patch: New file.
* gnu/packages/autotools.scm (libtool): Add patch.
* gnu-system.am (dist_patch_DATA): Add patch.
---
gnu-system.am | 1 +
gnu/packages/autotools.scm | 4 +++-
.../patches/libtool-skip-tests-for-mips.patch | 12 ++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/libtool-skip-tests-for-mips.patch
diff --git a/gnu-system.am b/gnu-system.am
index 5d3b13d2b7d..6c98ca31adc 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -238,6 +238,7 @@ dist_patch_DATA = \
gnu/packages/patches/hop-bigloo-4.0b.patch \
gnu/packages/patches/libevent-dns-tests.patch \
gnu/packages/patches/libtool-skip-tests.patch \
+ gnu/packages/patches/libtool-skip-tests-for-mips.patch \
gnu/packages/patches/m4-gets-undeclared.patch \
gnu/packages/patches/m4-readlink-EINVAL.patch \
gnu/packages/patches/make-impure-dirs.patch \
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index bcab4e37cdb..90f80872ed8 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -217,7 +217,9 @@ (define-public libtool
(sha256
(base32
"0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"))
- (patches (list (search-patch "libtool-skip-tests.patch")))))
+ (patches
+ (list (search-patch "libtool-skip-tests.patch")
+ (search-patch "libtool-skip-tests-for-mips.patch")))))
(build-system gnu-build-system)
(native-inputs `(("m4" ,m4)
("perl" ,perl)))
diff --git a/gnu/packages/patches/libtool-skip-tests-for-mips.patch b/gnu/packages/patches/libtool-skip-tests-for-mips.patch
new file mode 100644
index 00000000000..36587d23c23
--- /dev/null
+++ b/gnu/packages/patches/libtool-skip-tests-for-mips.patch
@@ -0,0 +1,12 @@
+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 \
--
GitLab