Set PKG_CONFIG_LIBDIR in autobuild.sh

If PKG_CONFIG_LIBDIR is not set when doing mingw32/64 builds,
then pkg-config may silently fallback to native versions of
libraries, with predictably bad results. Setting PKG_CONFIG_LIBDIR
forces it to only consider the mingw32/64 libraries.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-05-17 13:29:12 +01:00
parent 0d09854c10
commit 3e5752747c
1 changed files with 2 additions and 0 deletions

View File

@ -69,6 +69,7 @@ fi
if test -x /usr/bin/i686-w64-mingw32-gcc ; then if test -x /usr/bin/i686-w64-mingw32-gcc ; then
make distclean make distclean
PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \
PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
CC="i686-w64-mingw32-gcc" \ CC="i686-w64-mingw32-gcc" \
../configure \ ../configure \
@ -88,6 +89,7 @@ fi
if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
make distclean make distclean
PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \
PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
CC="x86_64-w64-mingw32-gcc" \ CC="x86_64-w64-mingw32-gcc" \
../configure \ ../configure \