From 1dd4e667afeb128450fc31d8556f7b41089b4b33 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 1 May 2013 16:10:19 +0100 Subject: Set PKG_CONFIG_LIBDIR variable for mingw builds To avoid pkg-config accidentally falling back to native versions, set the PKG_CONFIG_LIBDIR var explicitly Signed-off-by: Daniel P. Berrange --- autobuild.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autobuild.sh b/autobuild.sh index bd8f678..0966cd1 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -61,6 +61,7 @@ fi if [ -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 \ @@ -76,6 +77,7 @@ if [ -x /usr/bin/i686-w64-mingw32-gcc ]; then PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig pkg-config gtk+-3.0 1>/dev/null 2>&1 if test $? = 0 ; 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 --prefix=$AUTOBUILD_INSTALL_ROOT \ @@ -92,6 +94,7 @@ fi if [ -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 \ @@ -107,6 +110,7 @@ if [ -x /usr/bin/x86_64-w64-mingw32-gcc ]; then PKG_CONFIG_LIBDIR=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig pkg-config gtk+-3.0 1>/dev/null 2>&1 if test $? = 0 ; 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 --prefix=$AUTOBUILD_INSTALL_ROOT \ -- cgit