[PATCH core-updates] gnu: 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(-)

tags 64349 + patch moreinfo

retitle 64349 [PATCH] Persistent SSH forwarding service

retitle 66424 [PATCH core-updates] gnu: libxkbcommon: Fix cross-compile.

quit

--

Thanks,

Bruno.

Hello,

(CC'ing authors of two related commits too)

On Mon, Oct 09, 2023 at 11:07 PM, Zheng Junjie wrote:

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

Hi John,

John Kehayias <john.kehayias@protonmail.com> writes:

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.

I guess it depends which branch is expected to be the shortest lived

one; I'm giving about a month to let more time for core-updates to merge

interesting bits and build the branch and fix breakage. Take this with a

grain of salt; it's not fixed in stone.

Thanks,

Maxim

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.

Hi,

On Sun, Oct 15, 2023 at 01:30 AM, zhengjunjie@iscas.ac.cn wrote:

I'm not a cross-builder so I'll rely on you all for this.

If this change depends on other things in core-updates I'll leave it,

or if cross-building has had changes on core-updates. If it is just

something that can be done based on current master, I can cherry pick

the change from core-updates and apply this patch on mesa-updates.

What will work for everyone here?

I think my timeline will be quicker but I don't think this is

critical? I was just starting to gather what to apply on the mesa

branch, just waiting for the next mesa release (normally very quick

but current series has been delayed).

Thanks!

John

Hi all,

cc'ing Efraim too, since...

On Sun, Oct 15, 2023 at 01:30 AM, zhengjunjie@iscas.ac.cn wrote:

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

On Mon, Oct 16, 2023 at 02:28:13AM +0000, John Kehayias wrote:

Oh no! I really need to get better about checking the bug tracker to see

if someone else has already worked through changes I'm thinking of.

I tried a bit of pkg-config hackery/trickery for a bunch of the

packages, even messing with the meson cross definitions file, but it

turned out that pkg-config-for-build did the exact wrapping that was

needed AND it provided a symlink from (pkg-config-for-target) to

"pkg-config", which was what meson needed.

I'll cherry-pick the commits over to core-updates and then do some of

the fixups to make everything cleaner.

--

Efraim Flashner <efraim@flashner.co.il> ????? ?????

GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351

Confidentiality cannot be guaranteed on emails sent or received unencrypted

Hi Efraim,

Efraim Flashner <efraim@flashner.co.il> writes:

[...]

Thanks for the resolution, and sorry for the regression I had

introduced.

--

Thanks,

Maxim