[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/61: gnu: libgpg-error: Fix cross compilation.
From: |
guix-commits |
Subject: |
07/61: gnu: libgpg-error: Fix cross compilation. |
Date: |
Wed, 21 Aug 2019 04:24:49 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 3fe5f6b8caa5e0dacf0a9ed4b7744ffa8d9aa3d6
Author: Mathieu Othacehe <address@hidden>
Date: Sat Jun 29 17:21:37 2019 +0200
gnu: libgpg-error: Fix cross compilation.
* gnu/packages/gnupg.scm (libgpg-error)[arguments]: Add a lock-obj header to
the target platform when cross-compiling,
[native-inputs]: add gettext that is needed when cross-compiling.
---
gnu/packages/gnupg.scm | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 95a3536..c7e6aab 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2017 Petter <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Marius Bakke <address@hidden>
-;;; Copyright © 2018 Björn Höfling <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -96,6 +96,31 @@
(("namespace=errnos") "pkg_namespace=errnos"))
#t))))
(build-system gnu-build-system)
+ (arguments
+ (if (%current-target-system)
+ `(#:modules ((ice-9 match)
+ (guix build gnu-build-system)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ ;; When cross-compiling, some platform specific properties cannot
+ ;; be detected. Create a symlink to the appropriate platform
+ ;; file. See Cross-Compiling section at:
+ ;; https://github.com/gpg/libgpg-error/blob/master/README
+ (add-after 'unpack 'cross-symlinks
+ (lambda* (#:key target inputs #:allow-other-keys)
+ (let ((triplet
+ (match (string-take target
+ (string-index target #\-))
+ ("armhf" "arm-unknown-linux-gnueabi")
+ (x
+ (string-append x "-unknown-linux-gnu")))))
+ (symlink
+ (string-append "lock-obj-pub." triplet ".h")
+ "src/syscfg/lock-obj-pub.linux-gnu.h"))
+ #t))))
+ '()))
+ (native-inputs `(("gettext" ,gettext-minimal)))
(home-page "https://gnupg.org")
(synopsis "Library of error values for GnuPG components")
(description
- branch wip-cross-system created (now 74d4056), guix-commits, 2019/08/21
- 04/61: gnu: tk: Fix cross-compilation., guix-commits, 2019/08/21
- 06/61: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/08/21
- 11/61: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/08/21
- 12/61: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/21
- 10/61: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/21
- 09/61: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/21
- 07/61: gnu: libgpg-error: Fix cross compilation.,
guix-commits <=
- 14/61: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/21
- 08/61: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/21
- 01/61: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/21
- 03/61: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/21
- 02/61: gnu: python: Fix cross compilation., guix-commits, 2019/08/21
- 13/61: gnu: libgit2: Fix cross compilation., guix-commits, 2019/08/21
- 15/61: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 17/61: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/08/21
- 22/61: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/08/21
- 05/61: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/08/21