From 4aaad09db1a95a720562633046e08e5f7b4f684d Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 5 Apr 2015 10:22:28 +0200 Subject: [PATCH] gnu: gettext: Link explicitly to libexpat, again. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gettext.scm (gnu-gettext): Re-enable patch from 0e4e4b1329bcf881620f230fda60b6b63d1f8356 to explictly link to libexpat. Otherwise libexpat was searched at runtime via dlopen, which obviously doesn't work in a Guix context. Signed-off-by: Ludovic Courtès --- gnu/packages/gettext.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 27b5fb5f55..3a96cd613c 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -70,7 +70,15 @@ (define-public gnu-gettext (substitute* "gettext-tools/src/project-id" (("/bin/pwd") "pwd"))))) - %standard-phases) + (alist-cons-before + 'configure 'link-expat + (lambda _ + ;; Gettext defaults to opening expat via dlopen on + ;; "Linux". Change to link directly. + (substitute* "gettext-tools/configure" + (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") + (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))) + %standard-phases)) ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes")))