marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Set PKG_CONFIG_PATH to get the right settings for the target host. 

Ideally we would use the right <triplet>-pkg-config tool for the target
host. However Red Hat and SUSE respectively add '-redhat' and '-suse' to
the triplet which makes it hard to find the right tool. Furthermore on
Debian and derivatives a lot of development packages do not support
multiarch so that the required .pc files would not be found.

Setting PKG_CONFIG_PATH side-steps the non-standard Red Hat and SUSE
triplets. It also lets pkg-config fall back to the 'wrong' .pc files
on Debian which is fine in most cases, while using the right one in
cases where it matters (GStreamer 1.0), assuming they are actually
present.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Francois Gouget 2017-06-07 11:25:36 +02:00 committed by Alexandre Julliard
parent 2b03d20759
commit 20d41d9e28
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5138,6 +5138,8 @@ rm -f core conftest.err conftest.$ac_objext \
notice_platform="32-bit "
TARGETFLAGS="-m32"
PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_PATH
enable_win16=${enable_win16:-yes}
else
if test "x${GCC}" = "xyes"

2
configure.ac
View File

@ -151,6 +151,8 @@ case $host in
host_cpu="i386"
notice_platform="32-bit "
AC_SUBST(TARGETFLAGS,"-m32")
PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_PATH
enable_win16=${enable_win16:-yes}
else
if test "x${GCC}" = "xyes"