[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH 21/31] gnu: mit-krb5: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH 21/31] gnu: mit-krb5: Fix cross-compilation. |
Date: |
Mon, 8 Jul 2019 11:59:03 +0200 |
* 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 | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 873f5d8a37..8be4bd1ccc 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,23 @@
("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"))
+ #:configure-flags
+ (list ,@(if (%current-target-system)
+ '("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 ,@(if (%current-target-system)
+ '("CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1")
+ '()))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source-directory
@@ -78,8 +93,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")))
--
2.17.1
- [bug#36477] [PATCH 24/31] gnu: xmlto: Fix cross-compilation., (continued)
- [bug#36477] [PATCH 24/31] gnu: xmlto: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 20/31] gnu: libsamplerate: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 30/31] gnu: icu4c: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 26/31] gnu: tcsh: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 21/31] gnu: mit-krb5: Fix cross-compilation.,
Mathieu Othacehe <=
[bug#36477] [PATCH 17/31] gnu: texinfo-5: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 28/31] gnu: mkfontdir: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 27/31] gnu: pkg-config: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 29/31] gnu: alsa-utils: Fix cross-compilation., Mathieu Othacehe, 2019/07/08