From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Cc: 66424@debbugs.gnu.org,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Marius Bakke <marius@gnu.org>
Subject: [bug#66424] [PATCH core-updates] gnu: libxkbcommon: Fix cross-compile.
Date: Thu, 12 Oct 2023 18:07:56 +0000 [thread overview]
Message-ID: <87r0lz7lzg.fsf@protonmail.com> (raw)
In-Reply-To: <62c95fe412c55e9350adff139ff33cb6fe91db68.1696864062.git.zhengjunjie@iscas.ac.cn>
Hello,
(CC'ing authors of two related commits too)
On Mon, Oct 09, 2023 at 11:07 PM, Zheng Junjie wrote:
> * gnu/packages/xdisorg.scm (libxkbcommon): Fix cross-compile.
> [native-inputs]: When cross-compile add PKG-CONFIG-FOR-BUILD.
> ---
> gnu/packages/xdisorg.scm | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> index db948a9318..84bdcad031 100644
> --- a/gnu/packages/xdisorg.scm
> +++ b/gnu/packages/xdisorg.scm
> @@ -527,9 +527,13 @@ (define-public libxkbcommon
> wayland-protocols
> xkeyboard-config))
> (native-inputs
> - (list bison doxygen pkg-config python
> - ;; wayland-scanner is required at build time.
> - wayland))
> + (append
> + (if (%current-target-system)
> + (list pkg-config-for-build)
> + '())
> + (list bison doxygen pkg-config python
> + ;; wayland-scanner is required at build time.
> + wayland)))
> (arguments
> (list #:configure-flags
> #~(list (string-append "-Dxkb-config-root="
>
> base-commit: 9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554
When searching the log it looked like this had already been done on
core-updates in 5841ac3981a3a08968704728cef14accd14e7a1c (Marius) but I
was confused when I didn't see it. Looks like the pkg-config-for-build
was dropped (accidentally?) in 5841ac3981a3a08968704728cef14accd14e7a1c
(Maxim)
Is this still needed?
And if so, I can do it on mesa-updates very soon, since libx11 and
libxpm will be ungrafted and related packages (like mesa) updated too.
Or we can leave it to core-updates if that makes more sense.
WDYT?
Thanks!
John
next prev parent reply other threads:[~2023-10-12 18:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 15:07 [bug#66424] [PATCH] gnu: libxkbcommon: Fix cross-compile Zheng Junjie
2023-10-12 18:07 ` John Kehayias via Guix-patches via [this message]
2023-10-13 14:49 ` [bug#66424] [PATCH core-updates] " Maxim Cournoyer
2023-10-14 17:30 ` zhengjunjie
2023-10-14 21:02 ` John Kehayias via Guix-patches via
2023-10-16 2:28 ` bug#66424: " John Kehayias via Guix-patches via
2023-10-16 4:42 ` [bug#66424] " Efraim Flashner
2023-10-16 13:48 ` Maxim Cournoyer
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=87r0lz7lzg.fsf@protonmail.com \
--to=guix-patches@gnu.org \
--cc=66424@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
--cc=marius@gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=zhengjunjie@iscas.ac.cn \
/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).