From dfb7c765672091fce1f4297ad864c38d2cba3e53 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Wed, 21 Sep 2011 12:04:05 +0100 Subject: [PATCH] mingw-fetch-dependencies: Download config.guess and explicitly run it Previously the instructions were telling the developer to run ./build/config.guess to get the build name to pass to configure. However that file only exists after running automake so it's a bit awkward. This patch makes it download config.guess from the gitweb for automake and just explicitly run it. Reviewed-by: Robert Bragg --- build/mingw/mingw-fetch-dependencies.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh index 64f1ed872..b90bae670 100755 --- a/build/mingw/mingw-fetch-dependencies.sh +++ b/build/mingw/mingw-fetch-dependencies.sh @@ -28,6 +28,8 @@ GL_HEADER_URLS=( \ GL_HEADERS=( gl.h glext.h ); +CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=automake.git;a=blob_plain;f=lib/config.guess" + function download_file () { local url="$1"; shift; @@ -256,6 +258,8 @@ for dep in "${GL_HEADER_URLS[@]}"; do download_file "$dep" "$bn"; done; +download_file "$CONFIG_GUESS_URL" "config.guess"; + ## # Extract files ## @@ -325,6 +329,8 @@ chmod a+x "$RUN_PKG_CONFIG"; find_compiler; +build_config=`bash $DOWNLOAD_DIR/config.guess`; + echo echo "Done!" echo @@ -333,7 +339,7 @@ echo echo "To get started, you should be able to configure and build from" echo "the top of your cogl source directory as follows:" echo -echo "./configure --host=\"$TARGET\" --target=\"$TARGET\" --build=\"\`./build/config.guess\`\" --enable-wgl CFLAGS=\"-mms-bitfields -I$ROOT_DIR/include\" PKG_CONFIG=\"$RUN_PKG_CONFIG\"" PKG_CONFIG_PATH= +echo "./configure --host=\"$TARGET\" --target=\"$TARGET\" --build=\"$build_config\" --enable-wgl CFLAGS=\"-mms-bitfields -I$ROOT_DIR/include\" PKG_CONFIG=\"$RUN_PKG_CONFIG\"" PKG_CONFIG_PATH= echo "make" echo echo "Note: the explicit --build option is often necessary to ensure autoconf"