[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: gettext: Link explicitly to libexpat, again.
From: |
Ludovic Courtès |
Subject: |
02/02: gnu: gettext: Link explicitly to libexpat, again. |
Date: |
Sun, 05 Apr 2015 22:18:30 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 4aaad09db1a95a720562633046e08e5f7b4f684d
Author: Andy Wingo <address@hidden>
Date: Sun Apr 5 10:22:28 2015 +0200
gnu: gettext: Link explicitly to libexpat, again.
* 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 <address@hidden>
---
gnu/packages/gettext.scm | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 27b5fb5..3a96cd6 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -70,7 +70,15 @@
(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")))