From: muradm <mail@muradm.net>
To: Maxime Devos <maximedevos@telenet.be>, 56872@debbugs.gnu.org
Subject: [bug#56872] [PATCH v2] gnu: mu: Update to 1.8.7.
Date: Tue, 02 Aug 2022 22:03:06 +0300 [thread overview]
Message-ID: <87o7x2mplu.fsf@muradm.net> (raw)
In-Reply-To: <2e5423f0-62b8-7a78-0f4c-bc12d81035d3@telenet.be>
[-- Attachment #1.1: Type: text/plain, Size: 186 bytes --]
Hi,
This patch worked for me in my host.
I don't have any environment to see if working when
actually cross-compiling.
For the comment on coreutils, yeah missed update when removed.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-mu-Fix-cross-compiling.patch --]
[-- Type: text/x-patch, Size: 1602 bytes --]
From b688acbb5b9d6d65606edf2164cad09c9cf06225 Mon Sep 17 00:00:00 2001
From: muradm <mail@muradm.net>
Date: Tue, 2 Aug 2022 21:57:57 +0300
Subject: [PATCH] gnu: mu: Fix cross-compiling.
To: Maxime Devos <maximedevos@telenet.be>,
56872@debbugs.gnu.org
* gnu/packages/mail.scm (mu)[arguments]: Use search-input-file
to find /bin/sh and /bin/rm from inputs.
---
gnu/packages/mail.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ca4b3e819e..3776157c0b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1189,15 +1189,15 @@ (define-public mu
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-bin-references
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("guile/tests/test-mu-guile.cc"
"mu/tests/test-mu-cmd.cc"
"mu/tests/test-mu-cmd-cfind.cc"
"mu/tests/test-mu-query.cc")
- (("/bin/sh") (which "sh")))
+ (("/bin/sh") (search-input-file inputs "/bin/sh")))
(substitute* '("lib/tests/bench-indexer.cc"
"lib/utils/mu-utils.cc")
- (("/bin/rm") (which "rm")))))
+ (("/bin/rm") (search-input-file inputs "/bin/rm")))))
(add-after 'install 'install-emacs-autoloads
(lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads
--
2.37.1
[-- Attachment #1.3: Type: text/plain, Size: 849 bytes --]
Maxime Devos <maximedevos@telenet.be> writes:
> [[PGP Signed Part:Undecided]]
>
> On 01-08-2022 15:41, muradm wrote:
>> + (substitute* '("lib/utils/mu-utils.cc"
>> + "lib/tests/bench-indexer.cc")
>> + (("/bin/rm") (which "rm")))))
>
> The lib/utils/mu-utils.cc + 'which' looks wrong when
> cross-compiling
> -- try using search-input-file on 'inputs' instead (which looks
> in
> native-inputs (which happens to be merged with inputs when
> compiling
> natively))).
>
> (If it does not end up in the binary, then 'which' should be
> fine)
>
>> [inputs]: Removed guile added coreutils (for /bin/rm command).
> I'm not seeing coreutils in there.
>
> Greetings,
> Maxime
>
> [2. OpenPGP public key --- application/pgp-keys;
> OpenPGP_0x49E3EE22191725EE.asc]...
>
> [[End of PGP Signed Part]]
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2022-08-02 19:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-01 13:11 [bug#56872] [PATCH] gnu: mu: Update to 1.8.7 muradm
2022-08-01 13:41 ` [bug#56872] [PATCH v2] " muradm
2022-08-02 16:25 ` Maxime Devos
2022-08-02 19:03 ` muradm [this message]
2022-08-02 19:14 ` ( via Guix-patches via
2022-08-02 19:27 ` muradm
2022-08-02 19:59 ` Maxime Devos
2022-08-02 20:13 ` muradm
2022-08-02 20:19 ` Maxime Devos
2022-08-02 19:53 ` Maxime Devos
2022-08-01 13:44 ` [bug#56872] [PATCH v3] " muradm
2022-08-01 14:05 ` bug#56872: [PATCH] " Ricardo Wurmus
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=87o7x2mplu.fsf@muradm.net \
--to=mail@muradm.net \
--cc=56872@debbugs.gnu.org \
--cc=maximedevos@telenet.be \
/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).