aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/libunistring.scm
diff options
context:
space:
mode:
authorEric Bavier <bavier@cray.com>2017-10-30 11:23:46 -0500
committerEric Bavier <bavier@member.fsf.org>2017-11-06 17:32:42 -0600
commitacc2dab7f2f50c9169d6388007c770878eae4a9c (patch)
treedf9a400578fa2233dcde024127ea3c0b8b58b673 /gnu/packages/libunistring.scm
parenta7c7d5ab8bf2a5e7c21c401cb93ffa0164eccbbb (diff)
downloadguix-acc2dab7f2f50c9169d6388007c770878eae4a9c.tar
guix-acc2dab7f2f50c9169d6388007c770878eae4a9c.tar.gz
gnu: Disable gnulib's test-lock test in packages.
* gnu/packages/base.scm (findutils)[source]: Disable test-lock. * gnu/packages/gettext.scm (gettext-minimal)[source]: Ditto. * gnu/packages/libidn.scm (libidn)[source]: Ditto. * gnu/packages/libunistring.scm (libunistring)[source]: Ditto. * gnu/packages/augeas.scm (augeas)[source]: Ditto. * gnu/packages/gsasl.scm (gsasl)[source]: Ditto. * gnu/packages/patches/findutils-gnulib-multi-core.patch, gnu/packages/patches/gettext-gnulib-multi-core.patch, gnu/packages/patches/gettext-multi-core.patch, gnu/packages/patches/libunistring-gnulib-multi-core.patch: Delete patches. * gnu/local.mk (DIST_PATCH_DATA): Remove them.
Diffstat (limited to 'gnu/packages/libunistring.scm')
-rw-r--r--gnu/packages/libunistring.scm15
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm
index df02f68cea..bb7bc61e4d 100644
--- a/gnu/packages/libunistring.scm
+++ b/gnu/packages/libunistring.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,10 +41,16 @@
(sha256
(base32
"15z76qrmrvkc3c6hfq2lzzqysgd21s682f2smycfab5g598n8drf"))
- ;; test-lock has performance issues on multi-core machines,
- ;; it hangs or takes a long time to complete.
- ;; This is a commit from gnulib to fix this issue.
- (patches (search-patches "libunistring-gnulib-multi-core.patch"))))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; The gnulib test-lock test is prone to writer starvation
+ ;; with our glibc@2.25, which prefers readers, so disable it.
+ ;; The gnulib commit b20e8afb0b2 should fix this once
+ ;; incorporated here.
+ (substitute* "tests/Makefile.in"
+ (("test-lock\\$\\(EXEEXT\\) ") ""))
+ #t))))
(propagated-inputs (libiconv-if-needed))
(build-system gnu-build-system)
(arguments