From 0a1e8d9c1ecf7f1b4985dfda90708cd0d8c1b094 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 7 Oct 2013 16:53:47 +0100 Subject: Fixed Cygwin install for 32/64bit changes --- install-all.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/install-all.sh b/install-all.sh index 607c3221..cd0ed542 100755 --- a/install-all.sh +++ b/install-all.sh @@ -36,7 +36,12 @@ cygwin_prepare() chmod +x apt-cyg mv apt-cyg /usr/local/bin/ - apt-cyg install make gcc automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncurses-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + if [ -n "$CYG_MIRROR" ]; then + apt-cyg -m $CYG_MIRROR install make automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + else + apt-cyg install make automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + fi + ln -s /usr/bin/gcc-3.exe /usr/bin/gcc.exe export LIBRARY_PATH=/usr/local/lib/ @@ -109,6 +114,13 @@ cleanup() echo } +while getopts m: opt +do + case "$opt" in + m) CYG_MIRROR=$OPTARG;; + esac +done + OS=`uname -s` DIST=unknown -- cgit 1.4.1-2-gfad0