Skip to content

W
wine-winehq
Commit c7a97b5d authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

configure: Override PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH for 32-bit builds on 64-bit hosts.

This allows 32-bit packages to be found when the user has specified PKG_CONFIG_PATH for some other reason. This also mirrors the way e.g. i686-linux-gnu-pkg-config is implemented on Debian, and possibly other distributions as well. This also prevents 64-bit .pc files from being found. This was originally intended as a benefit [1], but can contribute to misdetection of headers which are not actually multiarch (e.g. GStreamer, although at the time that [1] was written that was a preëxisting problem). In general a distribution which provides .pc files for one architecture should be expected to provide them for any architecture that it actually provides libraries for; even if that was not true of Debian in 2017, it is now. I moreover assert it is better to fail to find a present library than to incorrectly find the wrong one. Note that we can't easily use i686-linux-gnu-pkg-config, as would otherwise be preferable, for reasons also described in [1]. [1] https://www.winehq.org/pipermail/wine-devel/2017-June/118002.html
parent 7c9d04a4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
configure
View file @ c7a97b5d
......@@ -6239,8 +6239,8 @@ printf "%s\n" "$wine_cv_cc_m32" >&6; }
host_cpu="i386"
notice_platform="32-bit "
TARGETFLAGS="$TARGETFLAGS -m32"
PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_LIBDIR
with_unwind=${with_unwind:-no}
else
if test "x${GCC}" = "xyes"
......
configure.ac
View file @ c7a97b5d
......@@ -129,8 +129,8 @@ case $host in
host_cpu="i386"
notice_platform="32-bit "
TARGETFLAGS="$TARGETFLAGS -m32"
PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_LIBDIR
with_unwind=${with_unwind:-no}
else
if test "x${GCC}" = "xyes"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment