summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2013-05-01 16:10:19 +0100
committerDaniel P. Berrange <berrange@redhat.com>2013-05-01 16:11:07 +0100
commit1dd4e667afeb128450fc31d8556f7b41089b4b33 (patch)
treed92f8ab690c0c710094dbcd6ec84ea4a4c19c506
parent1cd871cb661e7af6ba3cb219d28fe93666a23071 (diff)
downloadvirt-viewer-1dd4e667afeb128450fc31d8556f7b41089b4b33.tar.gz
virt-viewer-1dd4e667afeb128450fc31d8556f7b41089b4b33.tar.xz
virt-viewer-1dd4e667afeb128450fc31d8556f7b41089b4b33.zip
Set PKG_CONFIG_LIBDIR variable for mingw buildsv0.5.6
To avoid pkg-config accidentally falling back to native versions, set the PKG_CONFIG_LIBDIR var explicitly Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rwxr-xr-xautobuild.sh4
1 files changed, 4 insertions, 0 deletions
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 \