--- Begin Message ---
Subject: |
[PATCH] gnu: libxkbcommon: Fix cross-compile. |
Date: |
Mon, 9 Oct 2023 23:07:42 +0800 |
* 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
--
2.41.0
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#66424: [PATCH core-updates] gnu: libxkbcommon: Fix cross-compile. |
Date: |
Mon, 16 Oct 2023 02:28:13 +0000 |
Hi all,
cc'ing Efraim too, since...
On Sun, Oct 15, 2023 at 01:30 AM, zhengjunjie@iscas.ac.cn wrote:
>> 在 2023年10月13日,22:50,Maxim Cournoyer <maxim.cournoyer@gmail.com> 写道:
>>
>>
>> On the top of my head, I thought pkg-config-for-build had been obsolete
>> by the pkg-config symbol being dynamically bound to something that makes
>> sense for the context it's used in, via some macro trickery. I may have
>> misunderstood things
>
> For cross build,
>
> pkg-config -> xxxx-pkg-config
> pkg-config-for-build -> pkg-config
>
> libxkbcommon require wayland-scanner to generate c file, this is why
> need pkg-config-for-build, pkg-config is require by find library. Is
> different ,so libxkbcommon need both on cross build.
looks like the same change was made on master in
bc1634a197dc9ab7aa0dead8c7449bb5db09cea6. Along with other commits
then to do the same thing to other similar packages.
So, I'm closing as I believe this is done but figured I'd loop in
Efraim in case there was anything else on this matter to discuss.
Thanks all!
John
--- End Message ---