[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: newt: Fix cross-compilation.
From: |
guix-commits |
Subject: |
branch master updated: gnu: newt: Fix cross-compilation. |
Date: |
Sun, 07 Aug 2022 05:41:12 -0400 |
This is an automated email from the git hooks/post-receive script.
mothacehe pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new c0e713f6e2 gnu: newt: Fix cross-compilation.
c0e713f6e2 is described below
commit c0e713f6e2232593739181c89a886b9fd7be3a6c
Author: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
AuthorDate: Wed Jul 13 14:02:30 2022 +0200
gnu: newt: Fix cross-compilation.
* gnu/packages/slang.scm (newt): Fix-cross compilation.
[arguments]: Use G-Expressions for `#:configure-flags',
`#:make-flags' and `#:phases', also set correct path for
`python-config'.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/slang.scm | 49 ++++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm
index f335dc1a39..885fcf8c15 100644
--- a/gnu/packages/slang.scm
+++ b/gnu/packages/slang.scm
@@ -147,34 +147,41 @@ to inspect different parts of the same file, at the same
time.")
(inputs
(list slang popt python fribidi))
(arguments
- `(#:tests? #f ; no test suite
+ (list
+ #:tests? #f ; no test suite
#:configure-flags
;; Set the correct RUNPATH in binaries.
- (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+ #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
#:make-flags
;; configure uses a hard-coded search of /usr/include/python* to set
;; this variable, and does not allow us to override it from the
;; command line. Fortunately, the Makefile does, so provide it here.
- (list (string-append "PYTHONVERS=python"
- ,(version-major+minor (package-version python))))
+ #~(list
+ (string-append "PYTHONVERS=python"
+ #$(version-major+minor (package-version python))))
#:phases
- (modify-phases %standard-phases
- (add-after
- 'unpack 'patch-/usr/bin/install
- (lambda _
- (substitute* "po/Makefile"
- (("/usr/bin/install") "install"))
- #t))
- (add-after
- 'install 'move-python
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (py (assoc-ref outputs "python"))
- (ver ,(version-major+minor (package-version python))))
- (mkdir-p (string-append py "/lib"))
- (rename-file (string-append out "/lib/python" ver)
- (string-append py "/lib/python" ver))
- #t))))))
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-/usr/bin/install
+ (lambda _
+ (substitute* "po/Makefile"
+ (("/usr/bin/install") "install"))))
+ (add-before 'build 'add-python-config-to-path
+ (lambda* (#:key target #:allow-other-keys)
+ ;; When cross-compiling python-config is not present in $PATH.
+ ;;
+ ;; It is a shell script without dependencies on target binaries
+ ;; so it can be run on the host to allow cross-compilation.
+ (when target
+ (let ((path (getenv "PATH"))
+ (py (string-append #$python "/bin")))
+ (setenv "PATH" (string-append path ":" py))))))
+ (add-after 'install 'move-python
+ (lambda* _
+ (let ((ver #$(version-major+minor (package-version python))))
+ (mkdir-p (string-append #$output:python "/lib"))
+ (rename-file
+ (string-append #$output "/lib/python" ver)
+ (string-append #$output:python "/lib/python" ver))))))))
(home-page "https://pagure.io/newt")
(synopsis "Not Erik's Windowing Toolkit - text mode windowing with slang")
(description
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: newt: Fix cross-compilation.,
guix-commits <=