* [bug#49551] [PATCH] gnu: mg: Enable cross-compilation.
@ 2021-07-13 19:51 Pierre Langlois
2021-07-14 7:16 ` Mathieu Othacehe
0 siblings, 1 reply; 3+ messages in thread
From: Pierre Langlois @ 2021-07-13 19:51 UTC (permalink / raw)
To: 49551
[-- Attachment #1.1: Type: text/plain, Size: 330 bytes --]
Hi Guix!
I was trying to revive my pinebook pro over the weekend, and realised we
needed to cross-compile mg in order to get an inital bare-bones image.
OK to apply? I also removed the #t from the phases, hopefully that's OK,
I'm not sure if this sort of transition should be done incrementally or
all at once.
Thanks,
Pierre
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
[-- Attachment #2: 0001-gnu-mg-Enable-cross-compilation.patch --]
[-- Type: text/x-patch, Size: 3068 bytes --]
From 9bf02578c486cd4e65ab5faf30c86f972f05f300 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Tue, 13 Jul 2021 20:17:51 +0100
Subject: [PATCH] gnu: mg: Enable cross-compilation.
* gnu/packages/text-editors.scm (mg)[arguments]: Use cc-for-target.
Add phase to substitute pkg-config with the target's pkg-config.
---
gnu/packages/text-editors.scm | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 965ed6b9e7..11332fab0b 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2020 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -527,28 +528,32 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on
("ncurses" ,ncurses)))
(arguments
;; No test suite available.
- '(#:tests? #f
+ `(#:tests? #f
#:make-flags (list (string-append "prefix=" %output)
- "CC=gcc")
+ (string-append "CC=" ,(cc-for-target)))
#:phases (modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'build 'correct-location-of-difftool
(lambda _
(substitute* "buffer.c"
(("/usr/bin/diff")
- (which "diff")))
- #t))
+ (which "diff")))))
+ (add-before 'build 'pkg-config-for-cross-compiling-target
+ (lambda _
+ (substitute* "GNUmakefile"
+ (("pkg-config")
+ (or (which "pkg-config")
+ (string-append ,(%current-target-system)
+ "-pkg-config"))))))
(add-before 'install 'patch-tutorial-location
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "mg.1"
- (("/usr") (assoc-ref outputs "out")))
- #t))
+ (("/usr") (assoc-ref outputs "out")))))
(add-after 'install 'install-tutorial
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/mg")))
- (install-file "tutorial" doc)
- #t))))))
+ (install-file "tutorial" doc)))))))
(home-page "https://homepage.boetes.org/software/mg/")
(synopsis "Microscopic GNU Emacs clone")
(description
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#49551] [PATCH] gnu: mg: Enable cross-compilation.
2021-07-13 19:51 [bug#49551] [PATCH] gnu: mg: Enable cross-compilation Pierre Langlois
@ 2021-07-14 7:16 ` Mathieu Othacehe
2021-07-14 9:04 ` bug#49551: " Pierre Langlois
0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Othacehe @ 2021-07-14 7:16 UTC (permalink / raw)
To: Pierre Langlois; +Cc: 49551
Hey Pierre,
> I was trying to revive my pinebook pro over the weekend, and realised we
> needed to cross-compile mg in order to get an inital bare-bones image.
Oops missed that when I added mg to the installation image. Your patch
looks fine, please go ahead.
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#49551: [PATCH] gnu: mg: Enable cross-compilation.
2021-07-14 7:16 ` Mathieu Othacehe
@ 2021-07-14 9:04 ` Pierre Langlois
0 siblings, 0 replies; 3+ messages in thread
From: Pierre Langlois @ 2021-07-14 9:04 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 49551-done, Pierre Langlois
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
Hi Mathieu,
Mathieu Othacehe writes:
> Hey Pierre,
>
>> I was trying to revive my pinebook pro over the weekend, and realised we
>> needed to cross-compile mg in order to get an inital bare-bones image.
>
> Oops missed that when I added mg to the installation image. Your patch
> looks fine, please go ahead.
No worries! Pushed with 681a0c75182e3f5cc5d8dba063451a96d64fa23c.
Thanks for the review,
Pierre
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-14 9:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-13 19:51 [bug#49551] [PATCH] gnu: mg: Enable cross-compilation Pierre Langlois
2021-07-14 7:16 ` Mathieu Othacehe
2021-07-14 9:04 ` bug#49551: " Pierre Langlois
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.