[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/18: gnu: libgcrypt: Fix cross-compilation.
From: |
guix-commits |
Subject: |
11/18: gnu: libgcrypt: Fix cross-compilation. |
Date: |
Sat, 11 Apr 2020 13:26:08 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 7e7033d16e96f4c3226fead4820a01b1b32da275
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")
- 05/18: gnu: hurd: Provide our own /libexec/rc script., (continued)
- 05/18: gnu: hurd: Provide our own /libexec/rc script., guix-commits, 2020/04/11
- 06/18: gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd., guix-commits, 2020/04/11
- 13/18: gnu: libdaemon: Allow cross-compilation., guix-commits, 2020/04/11
- 14/18: gnu: libdaemon: Cross-build with --localstatedir=/var., guix-commits, 2020/04/11
- 07/18: gnu: hurd: Use a 32-bit MiG when cross-compiling., guix-commits, 2020/04/11
- 09/18: gnu: hurd: Ensure startup scripts refer to the right programs., guix-commits, 2020/04/11
- 10/18: gnu: hurd: Install the UTF-8 motd., guix-commits, 2020/04/11
- 15/18: gnu: hurd: Add dependency on libdaemon., guix-commits, 2020/04/11
- 12/18: gnu: hurd: Add dependency on libgcrypt., guix-commits, 2020/04/11
- 16/18: gnu: hurd: Install a BDF font., guix-commits, 2020/04/11
- 11/18: gnu: libgcrypt: Fix cross-compilation.,
guix-commits <=
- 17/18: gnu: cross-libc: Add patch to allow 'gettyent' reading store file names., guix-commits, 2020/04/11
- 18/18: gnu: guile@3: Disable JIT on GNU/Hurd., guix-commits, 2020/04/11