[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: nettle: Disable ifunc method of library initialization.
From: |
Mark H. Weaver |
Subject: |
01/01: gnu: nettle: Disable ifunc method of library initialization. |
Date: |
Tue, 23 Jun 2015 14:10:40 +0000 |
mhw pushed a commit to branch nettle-fix
in repository guix.
commit ea1a6ccebacb5b21a256af6c42e104af4f389514
Author: Mark H Weaver <address@hidden>
Date: Tue Jun 23 10:08:30 2015 -0400
gnu: nettle: Disable ifunc method of library initialization.
* gnu/packages/nettle.scm (nettle)[arguments]: Add
'disable-ifunc-init-method'
phase.
---
gnu/packages/nettle.scm | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm
index 77c5080..b20ddfa 100644
--- a/gnu/packages/nettle.scm
+++ b/gnu/packages/nettle.scm
@@ -68,8 +68,21 @@ themselves.")
(base32
"0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z"))))
(arguments
- (substitute-keyword-arguments (package-arguments nettle-2)
- ((#:configure-flags flags)
- ;; Build "fat" binaries where the right implementation is chosen at
- ;; run time based on CPU features (starting from 3.1.)
- `(cons "--enable-fat" ,flags))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after
+ 'configure 'disable-ifunc-init-method
+ (lambda _
+ ;; Work around problems with the ifunc initialization method in
+ ;; nettle. For details, see
+ ;;
<http://lists.lysator.liu.se/pipermail/nettle-bugs/2015/003389.html>
+ ;; and <https://sourceware.org/ml/libc-help/2015-06/msg00010.html>.
+ (substitute* "config.h"
+ (("#define HAVE_LINK_IFUNC 1")
+ "/* #undef HAVE_LINK_IFUNC */"))
+ #t)))
+ ,@(substitute-keyword-arguments (package-arguments nettle-2)
+ ((#:configure-flags flags)
+ ;; Build "fat" binaries where the right implementation is chosen
+ ;; at run time based on CPU features (starting from 3.1.)
+ `(cons "--enable-fat" ,flags)))))))