[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/61: gnu: mit-krb5: Fix cross-compilation.
From: |
guix-commits |
Subject: |
21/61: gnu: mit-krb5: Fix cross-compilation. |
Date: |
Wed, 21 Aug 2019 04:24:51 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 42d82ac2da62a94bc037c72945cfd55b5328967b
Author: Mathieu Othacehe <address@hidden>
Date: Fri Jul 5 09:34:28 2019 +0200
gnu: mit-krb5: Fix cross-compilation.
* gnu/packages/kerberos.scm (mit-krb5)[arguments]: Disable tests when
cross-compiling. Add cross-compilation specific configure-flags and
make-flags. Search for perl in native-inputs or inputs.
---
gnu/packages/kerberos.scm | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 1253a58..bf344ce 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Alex Vong <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,9 +69,21 @@
("perl" ,perl)))
(arguments
`(;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call
- ;; while running the tests in 'src/tests'.
- #:tests? ,(string=? (%current-system) "x86_64-linux")
+ ;; while running the tests in 'src/tests'. Also disable tests when
+ ;; cross-compiling.
+ #:tests? ,(and (not (%current-target-system))
+ (string=? (%current-system) "x86_64-linux"))
+ ,@(if (%current-target-system)
+ '(#:configure-flags
+ (list "krb5_cv_attr_constructor_destructor=yes"
+ "ac_cv_func_regcomp=yes"
+ "ac_cv_printf_positional=yes"
+ "ac_cv_file__etc_environment=yes"
+ "ac_cv_file__etc_TIMEZONE=no")
+ #:make-flags
+ (list "CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1"))
+ '())
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory
@@ -78,8 +91,8 @@
(chdir "src")
#t))
(add-before 'check 'pre-check
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((perl (assoc-ref inputs "perl")))
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((perl (assoc-ref (or native-inputs inputs) "perl")))
(substitute* "plugins/kdb/db2/libdb2/test/run.test"
(("/bin/cat") (string-append perl "/bin/perl"))
(("D/bin/sh") (string-append "D" (which "sh")))
- 42/61: gnu: guile-sqlite3: Fix cross-compilation., (continued)
- 42/61: gnu: guile-sqlite3: Fix cross-compilation., guix-commits, 2019/08/21
- 48/61: gnu: guile-xcb: Fix cross-compilation., guix-commits, 2019/08/21
- 51/61: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/08/21
- 53/61: gnu: grub: Fix cross-compilation., guix-commits, 2019/08/21
- 43/61: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/21
- 56/61: gexp: Use cross extensions when cross-compiling., guix-commits, 2019/08/21
- 59/61: system: vm: Add arm64 support., guix-commits, 2019/08/21
- 61/61: scripts: system: Add --target option., guix-commits, 2019/08/21
- 25/61: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/08/21
- 29/61: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/08/21
- 21/61: gnu: mit-krb5: Fix cross-compilation.,
guix-commits <=
- 20/61: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 23/61: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/21
- 33/61: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/21
- 35/61: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/08/21
- 36/61: gnu: openldap: Fix cross-compilation., guix-commits, 2019/08/21
- 37/61: gnu: swig: Fix cross-compilation., guix-commits, 2019/08/21
- 18/61: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/21
- 38/61: gnu: git: Fix cross-compilation., guix-commits, 2019/08/21
- 47/61: gnu: crda: Fix cross-compilation, guix-commits, 2019/08/21
- 46/61: gnu: libnl: Fix cross-compilation., guix-commits, 2019/08/21