[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: libgcrypt: Fix cross-compilation.
From: |
guix-commits |
Subject: |
01/03: gnu: libgcrypt: Fix cross-compilation. |
Date: |
Tue, 7 Apr 2020 03:24:25 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 48e208b9607cde03b5508294835d138ad1ef1c24
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Tue Apr 7 07:41:08 2020 +0200
gnu: libgcrypt: Fix cross-compilation.
This works around
/gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash
../libtool --tag=CC --mode=link i586-pc-gnu-gcc
-I/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/include -g -O2
-fvisibility=hidden -fno-delete-null-pointer-checks -Wall -o mpicalc
mpicalc-mpicalc.o libgcrypt.la
-L/gnu/store/8x9dhckldm6iy1digklfanmvdaizq11f-libgpg-error-1.37/lib -lgpg-error
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_lshift'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_add_n'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_addmul_1'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_submul_1'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_mul_1'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_sub_n'
i586-pc-gnu-ld: ./.libs/libgcrypt.so: undefined reference to
`_gcry_mpih_rshift'
* gnu/packages/gnupg.scm (libgcrypt)[arguments]: Disable assembly when
cross-compiling.
---
gnu/packages/gnupg.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 498a6a1..298f18a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -148,7 +148,10 @@ Daemon and possibly more in the future.")
;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one.
`(#:configure-flags
(list (string-append "--with-gpg-error-prefix="
- (assoc-ref %build-inputs "libgpg-error-host")))))
+ (assoc-ref %build-inputs "libgpg-error-host"))
+ ;; When cross-compiling, _gcry_mpih_lshift etc are undefined
+ ,@(if (%current-target-system) '("--disable-asm")
+ '()))))
(outputs '("out" "debug"))
(home-page "https://gnupg.org/")
(synopsis "Cryptographic function library")