[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/64: gnu: libnl: Fix cross-compilation.
From: |
guix-commits |
Subject: |
48/64: gnu: libnl: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:23 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 7d003eba8b46aa4ef78ae0bc03a143fe88d19afb
Author: Pierre-Moana Levesque <address@hidden>
Date: Fri Aug 2 12:57:29 2019 +0200
gnu: libnl: Fix cross-compilation.
* gnu/packages/linux.scm (libnl)[inputs]: Add python-2 and python-3 unless
cross-compiling,
[outputs]: disable python2 and python3 outputs when cross-compiling,
[arguments]: Disable install-python phase when cross-compiling. In
install-doc
phase, search libnl3-doc in both inputs and native-inputs.
---
gnu/packages/linux.scm | 49 +++++++++++++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cf403c4..4b3d2c8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -36,6 +36,7 @@
;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
;;; Copyright © 2019 Stefan Stefanović <address@hidden>
;;; Copyright © 2019 Pierre Langlois <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1949,36 +1950,44 @@ transparently through a bridge.")
(string-join (string-split version #\.) "_")
"/libnl-doc-" version ".tar.gz"))
(sha256
- (base32
"1m5cnzviv31gjnz6fz5rgyl6ah4dbp2akm49j9973sgwl36gs8jx"))))))
- (inputs
- `(("python-2" ,python-2)
- ("python-3" ,python-3)))
- (outputs '("out" "doc" "python2" "python3"))
+ (base32 "1m5cnzviv31gjnz6fz5rgyl6ah4dbp2akm49j9973sgwl36gs8jx"))))
+ ,@(if (%current-target-system)
+ '()
+ '(("python-2" ,python-2)
+ ("python-3" ,python-3)))))
+ (outputs `("out" "doc"
+ ,@(if (%current-target-system)
+ '()
+ '("python2" "python3"))))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1))
#:phases
(modify-phases %standard-phases
- (add-after 'install 'install-python
- (lambda* (#:key outputs #:allow-other-keys)
- (define (python-inst python)
- (invoke python "setup.py" "build")
- (invoke python "setup.py" "install"
- (string-append "--prefix="
- (assoc-ref %outputs python)))
- (invoke python "setup.py" "clean"))
- (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib"
- (assoc-ref %outputs "out")))
- (with-directory-excursion "./python"
- (for-each python-inst '("python2" "python3")))
- #t))
+ ,@(if (%current-target-system)
+ '()
+ ;; Cross building Python extensions is not supported.
+ '((add-after 'install 'install-python
+ (lambda* (#:key outputs #:allow-other-keys)
+ (define (python-inst python)
+ (invoke python "setup.py" "build")
+ (invoke python "setup.py" "install"
+ (string-append "--prefix="
+ (assoc-ref %outputs python)))
+ (invoke python "setup.py" "clean"))
+ (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib"
+ (assoc-ref %outputs "out")))
+ (with-directory-excursion "./python"
+ (for-each python-inst '("python2" "python3")))
+ #t))))
(add-after 'install 'install-doc
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
(let ((dest (string-append (assoc-ref outputs "doc")
"/share/doc/libnl")))
(mkdir-p dest)
- (invoke "tar" "xf" (assoc-ref inputs "libnl3-doc")
+ (invoke "tar" "xf"
+ (assoc-ref (or native-inputs inputs) "libnl3-doc")
"--strip-components=1" "-C" dest)))))))
(home-page "https://www.infradead.org/~tgr/libnl/")
(synopsis "NetLink protocol library suite")
- 18/64: gnu: bc: Fix cross-compilation., (continued)
- 18/64: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/23
- 08/64: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/23
- 21/64: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/08/23
- 23/64: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/23
- 30/64: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/08/23
- 33/64: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/23
- 42/64: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/08/23
- 59/64: gexp: Pass target to compiled-modules in lower-gexp., guix-commits, 2019/08/23
- 43/64: gnu: guile-sqlite3: Fix cross-compilation., guix-commits, 2019/08/23
- 60/64: utils: Use target-arm64? and target-arm? helpers., guix-commits, 2019/08/23
- 48/64: gnu: libnl: Fix cross-compilation.,
guix-commits <=
- 56/64: linux-initrd: Use native gzip., guix-commits, 2019/08/23
- 54/64: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/08/23
- 51/64: gnu: guile-wm: Fix cross-compilation., guix-commits, 2019/08/23
- 64/64: scripts: system: Add --target option., guix-commits, 2019/08/23
- 63/64: system: vm: Support cross-compilation., guix-commits, 2019/08/23