[PATCH 0/1] MR7022: configure: Add /usr/lib64/pkgconfig to the 32-bit search path.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53953 This is not what I would do. Bug 53953 amounts to "some users didn't install 32-bit headers, so we used the wrong ones, which are usually identical so it doesn't matter". From the perspective of using the software as intended, this is unilaterally user error.
From a more utilitarian perspective, this is a regression, and ensuring that we're not using the *functionally* incorrect headers is a problem we have to solve anyway. (Cf. GStreamer, which may be the only interesting case.)
On the other hand, it's a regression that's already been in two major versions. Anyone building Wine on Fedora has surely already installed the right headers by now. I'm submitting this patch in an attempt to garner a decreed resolution to the bug, one way or another, but again, this solution is not the one I would prescribe if it were my choice. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7022
From: Elizabeth Figura <zfigura(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53953 --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6596f653fb1..1d6a2b55b4a 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,10 @@ case $host in host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="$TARGETFLAGS -m32" - PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig} + dnl Search 64-bit directories, even though it's explicitly the wrong architecture. + dnl Most headers end up being identical anyway, and this allows users to not need + dnl to go out of their way to install the right headers. + PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig} export PKG_CONFIG_LIBDIR else CC="$CC -m64" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7022
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=150395 Your paranoid android. === debian11b (64 bit WoW report) === user32: msg.c:12676: Test failed: Got expected 0. msg.c:12691: Test failed: Got expected 0.
FWIW, since Fedora 40, it's no longer possible to install side by side the i386 & x86_64 glib2 devel packages [1] hence with impact on freetype, gstreamer devel packages installation, and corresponding Wine DLLs compilation IMO, it wouldn't hurt to enforce the pkgconfig search to the relevant arch only (on Fedora) [1] https://bugzilla.redhat.com/show_bug.cgi?id=2258600 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7022#note_90548
As far as I understand, there is an explicit pkgconfig error, and we are now logging that error properly in config.log, so the user should be able to figure it out. I don't think we need to use the wrong version of the headers to hide the issue. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7022#note_90819
That makes sense to me. I'll resolve the bug as INVALID then. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7022#note_90820
This merge request was closed by Elizabeth Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7022
participants (5)
-
Alexandre Julliard (＠julliard) -
Elizabeth Figura
-
Elizabeth Figura (＠zfigura)
-
eric pouech (＠epo)
-
Marvin