[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: gnu: libgpg-error: Fix cross compilation.
From: |
guix-commits |
Subject: |
07/08: gnu: libgpg-error: Fix cross compilation. |
Date: |
Sat, 29 Jun 2019 11:41:57 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 9a44904e86665a14fd863dbce18325177e074452
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 | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index f84f8d7..68e8270 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2017 Petter <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -86,6 +87,27 @@
(base32
"1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3"))))
(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
+ (add-after 'unpack 'cross-symlinks
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((target ,(%current-target-system))
+ (tuple
+ (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." tuple ".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 6e59bb8), guix-commits, 2019/06/29
- 02/08: gnu: python: Fix cross compilation., guix-commits, 2019/06/29
- 01/08: gnu: perl: Fix cross-compilation., guix-commits, 2019/06/29
- 04/08: gnu: tk: Fix cross-compilation., guix-commits, 2019/06/29
- 07/08: gnu: libgpg-error: Fix cross compilation.,
guix-commits <=
- 06/08: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/06/29
- 03/08: gnu: tcl: Fix cross-compilation., guix-commits, 2019/06/29
- 05/08: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/06/29
- 08/08: gnu: python: Fix cross-compilation., guix-commits, 2019/06/29