From: Jean Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: 56536@debbugs.gnu.org
Subject: [bug#56536] [PATCH]: gnu: newt: Fix cross-compilationn
Date: Wed, 13 Jul 2022 12:08:35 +0000 [thread overview]
Message-ID: <u-v2YsVfeScaOns6KMfzmPCVtlwTE_g1Pbah7Y_LfuDgnRK5FiWC6aUYPgwY3hl7RwriLlyJKAtmqMEPPhLjkaIpcblKsYdwar0IsvTTX-k=@jeandudey.tech> (raw)
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
Updates the newt package to use G-Expressions and
adds support for cross-compilation in the process
by adding python3.9-config and python-config to
$PATH.
To test:
./pre-inst-env guix build newt \
--target=aarch64-linux-gnu
—
Jean-Pierre De Jesus DIAZ
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-newt-Fix-cross-compilation.patch --]
[-- Type: text/x-patch; name=0001-gnu-newt-Fix-cross-compilation.patch, Size: 4098 bytes --]
From 47dda376c0583aef2cf5c4ddd2a2223f357e4a98 Mon Sep 17 00:00:00 2001
Message-Id: <47dda376c0583aef2cf5c4ddd2a2223f357e4a98.1657713910.git.me@jeandudey.tech>
From: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
Date: Wed, 13 Jul 2022 14:02:30 +0200
Subject: [PATCH] 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'.
---
gnu/packages/slang.scm | 50 ++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm
index c8de04667f..ab13c874d2 100644
--- a/gnu/packages/slang.scm
+++ b/gnu/packages/slang.scm
@@ -24,6 +24,7 @@ (define-module (gnu packages slang)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages readline)
#:use-module (gnu packages ncurses)
@@ -103,34 +104,41 @@ (define-public newt
(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
--
2.36.1
next reply other threads:[~2022-07-13 12:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-13 12:08 Jean Pierre De Jesus DIAZ via Guix-patches via [this message]
2022-08-06 16:40 ` [bug#56536] [PATCH]: gnu: newt: Fix cross-compilationn Mathieu Othacehe
2022-08-06 16:54 ` Jean Pierre De Jesus DIAZ via Guix-patches via
2022-08-06 17:34 ` Mathieu Othacehe
2022-08-07 9:41 ` bug#56536: " Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='u-v2YsVfeScaOns6KMfzmPCVtlwTE_g1Pbah7Y_LfuDgnRK5FiWC6aUYPgwY3hl7RwriLlyJKAtmqMEPPhLjkaIpcblKsYdwar0IsvTTX-k=@jeandudey.tech' \
--to=guix-patches@gnu.org \
--cc=56536@debbugs.gnu.org \
--cc=me@jeandudey.tech \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).