]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Set PKG_CONFIG_LIBDIR in autobuild.sh
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 17 May 2013 12:29:12 +0000 (13:29 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 17 May 2013 16:09:29 +0000 (17:09 +0100)
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>
autobuild.sh

index a8781b0791178fc3d5f168df13a6f0d06d1e4e2a..7da8cb5ed298c97116ef91d0fe980d5cc8594821 100755 (executable)
@@ -69,6 +69,7 @@ fi
 if test -x /usr/bin/i686-w64-mingw32-gcc ; then
   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" \
   CC="i686-w64-mingw32-gcc" \
   ../configure \
@@ -88,6 +89,7 @@ fi
 if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
   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" \
   CC="x86_64-w64-mingw32-gcc" \
   ../configure \