diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-11-03 18:15:00 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-11-03 23:25:59 -0500 |
| commit | bf2cc1e5d14df7d8ff0c9456798d48fba65de317 (patch) | |
| tree | be3b07c00fdea863c85ed4e9096336bca1a5d81c | |
| parent | 2c1ceeacdf00c9fa6b4324b693c9998745f84b1c (diff) | |
| download | guix-bf2cc1e5d14df7d8ff0c9456798d48fba65de317.tar.gz guix-bf2cc1e5d14df7d8ff0c9456798d48fba65de317.zip | |
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.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/autotools.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/libtool-skip-tests-for-mips.patch | 12 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 5d3b13d2b7..6c98ca31ad 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 bcab4e37cd..90f80872ed 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -217,7 +217,9 @@ simplifying the entire process for the developer.") (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 0000000000..36587d23c2 --- /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 \ |