[gtk-vnc] Fix triplet for mingw64 64-bit builds in autobuild.sh



commit a67bbba8c1fbbf9bc2839b07fa6d6f2f9ca13184
Author: Daniel P. Berrange <berrange redhat com>
Date:   Thu Jun 21 15:41:29 2012 +0100

    Fix triplet for mingw64 64-bit builds in autobuild.sh

 autobuild.sh |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/autobuild.sh b/autobuild.sh
index 4605d1b..59ae042 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -62,7 +62,7 @@ fi
 if [ -x /usr/bin/i686-w64-mingw32-gcc ]; then
   make distclean
 
-  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/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" \
   ../configure \
     --build=$(uname -m)-w64-linux \
@@ -80,7 +80,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_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/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" \
     ../configure --prefix=$AUTOBUILD_INSTALL_ROOT \
       --build=$(uname -m)-w64-linux \
@@ -96,17 +96,17 @@ if [ -x /usr/bin/i686-w64-mingw32-gcc ]; then
 fi
 
 
-if [ -x /usr/bin/i686-w64-mingw64-gcc ]; then
+if [ -x /usr/bin/x86_64-w64-mingw32-gcc ]; then
   make distclean
 
-  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw64/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw64/sys-root/mingw/lib/pkgconfig" \
-  CC="i686-w64-mingw64-gcc" \
+  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
+  CC="x86_64-w64-mingw32-gcc" \
   ../configure \
     --build=$(uname -m)-w64-linux \
-    --host=i686-w64-mingw64 \
+    --host=x86_64-w64-mingw32 \
     --without-python \
     --without-sasl \
-    --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw64/sys-root/mingw" \
+    --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \
     --enable-werror \
     --with-gtk=2.0
 
@@ -114,17 +114,17 @@ if [ -x /usr/bin/i686-w64-mingw64-gcc ]; then
   make install
 
   # Test GTK3 build too if available
-  PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw64/sys-root/mingw/lib/pkgconfig pkg-config gtk+-3.0 1>/dev/null 2>&1
+  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_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw64/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw64/sys-root/mingw/lib/pkgconfig" \
-    CC="i686-w64-mingw64-gcc" \
+    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 \
       --build=$(uname -m)-w64-linux \
-      --host=i686-w64-mingw64 \
+      --host=x86_64-w64-mingw32 \
       --without-python \
       --without-sasl \
-      --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw64/sys-root/mingw" \
+      --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \
       --enable-werror \
       --with-gtk=3.0
     make
@@ -132,7 +132,7 @@ if [ -x /usr/bin/i686-w64-mingw64-gcc ]; then
   fi
 fi
 
-if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/i686-w64-mingw64-gcc ; then
+if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
   if [ -f /usr/bin/rpmbuild ]; then
     rpmbuild --nodeps \
        --define "extra_release $EXTRA_RELEASE" \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]