[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/52: gnu: libgcrypt: Fix cross-compilation.
From: |
guix-commits |
Subject: |
26/52: gnu: libgcrypt: Fix cross-compilation. |
Date: |
Thu, 9 Apr 2020 13:29:08 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit d6a205e4bac52f050d4ba6fcd09c801e5e2276c6
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")
- 11/52: gnu: guile@3: Disable JIT on GNU/Hurd., (continued)
- 11/52: gnu: guile@3: Disable JIT on GNU/Hurd., guix-commits, 2020/04/09
- 17/52: system: hurd: Add "/etc/passwd"., guix-commits, 2020/04/09
- 15/52: gnu: hurd: Add "hurd/sbin" to PATH., guix-commits, 2020/04/09
- 18/52: gnu: cross-libc: Add patch to allow 'gettyent' reading store file names., guix-commits, 2020/04/09
- 20/52: system: hurd: Add "/etc/shadow"., guix-commits, 2020/04/09
- 24/52: vm: Preserve file permissions on /dev., guix-commits, 2020/04/09
- 25/52: linux-boot: 'make-essential-device-nodes' root parameter is optional., guix-commits, 2020/04/09
- 19/52: system: hurd: Add "/bin/sh" symlink., guix-commits, 2020/04/09
- 16/52: system: hurd: Add ttys symlink in "/etc/ttys"., guix-commits, 2020/04/09
- 30/52: vm: Make the device node procedure a parameter., guix-commits, 2020/04/09
- 26/52: gnu: libgcrypt: Fix cross-compilation.,
guix-commits <=
- 23/52: database: 'reset-timestamps' can optionally preserve permissions., guix-commits, 2020/04/09
- 22/52: system: hurd: Create /etc/{hostname,motd,login} and /root., guix-commits, 2020/04/09
- 29/52: linux-boot: Add 'make-hurd-device-nodes'., guix-commits, 2020/04/09
- 28/52: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/09
- 34/52: gnu: hurd: Add dependency on libgcrypt., guix-commits, 2020/04/09
- 32/52: system: hurd: Add guix., guix-commits, 2020/04/09
- 36/52: gnu: hurd: Install a BDF font., guix-commits, 2020/04/09
- 33/52: gnu: libdaemon: Allow cross-compilation., guix-commits, 2020/04/09
- 21/52: gnu: hurd: Install the UTF-8 motd., guix-commits, 2020/04/09
- 31/52: gnu: guix: Fix cross-compilation., guix-commits, 2020/04/09