Re: pkg/57232: pkgsrc/emulators/qemu can't be compiled if it's already installed

[John Klos <john%ziaspace.com@localhost>]

Hello,

> Hi john, I think this is fixed by my commit that changes
> /usr/X11R7/lib/pkgconfig/xkeyboard-config.pc .
> http://cvsweb.netbsd.org/bsdweb.cgi/src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in?only_with_tag=MAIN
>
> xkbcommon in pkgsrc has to be rebuilt to fix your
> problem since it uses xkeyboard-config.pc during
> build to set where it is to look for xkb data.
>
> What does /usr/X11R7/lib/pkgconfig/xkeyboard-config.pc
> look like on your machine?

I've updated a machine to 10.99.2 from yesterday (16-Feb-2023), then 
deleted the qemu package, made sure the work directory didn't exist, then 
built and installed qemu, then tried to do a "make update" of qemu. The 
final "make update" failed here:

[5719/6717] Generating pc-bios/edk2-i386-code.fd with a custom command 
(wrapped by meson to capture output)
[5720/6717] Linking target storage-daemon/qemu-storage-daemon
[5721/6717] Generating pc-bios/keymaps/ar with a custom command
FAILED: pc-bios/keymaps/ar
/usr/local/bin/qemu-keymap -f pc-bios/keymaps/ar -l ar
xkbcommon: ERROR: failed to add default include path 
/usr/X11R7/share/X11/xkb
[5722/6717] Generating pc-bios/edk2-i386-secure-code.fd with a custom 
command (wrapped by meson to capture output)
[5723/6717] Generating pc-bios/edk2-x86_64-code.fd with a custom command 
(wrapped by meson to capture output)
[5724/6717] Generating pc-bios/edk2-x86_64-secure-code.fd with a custom 
command (wrapped by meson to capture output)
ninja: build stopped: subcommand failed.
*** Error code 1


/usr/X11R7/lib/pkgconfig/xkeyboard-config.pc now contains:

prefix=/usr/X11R7
datarootdir=${prefix}/share
datadir=${datarootdir}
xkb_base=${prefix}/lib/X11/xkb

Name: XKeyboardConfig
Description: X Keyboard configuration data
Version: 2.37

Before the update, it had this:

(a blank line)
datadir=/usr/X11R7/share
xkb_base=/usr/X11R7/share/X11/xkb

Name: XKeyboardConfig
Description: X Keyboard configuration data
Version: 2.37

What else can I test?

Thanks,
John