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 <robert@linux.intel.com>
This commit is contained in:
parent
a08c1978cb
commit
dfb7c76567
@ -28,6 +28,8 @@ GL_HEADER_URLS=( \
|
|||||||
|
|
||||||
GL_HEADERS=( gl.h glext.h );
|
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 ()
|
function download_file ()
|
||||||
{
|
{
|
||||||
local url="$1"; shift;
|
local url="$1"; shift;
|
||||||
@ -256,6 +258,8 @@ for dep in "${GL_HEADER_URLS[@]}"; do
|
|||||||
download_file "$dep" "$bn";
|
download_file "$dep" "$bn";
|
||||||
done;
|
done;
|
||||||
|
|
||||||
|
download_file "$CONFIG_GUESS_URL" "config.guess";
|
||||||
|
|
||||||
##
|
##
|
||||||
# Extract files
|
# Extract files
|
||||||
##
|
##
|
||||||
@ -325,6 +329,8 @@ chmod a+x "$RUN_PKG_CONFIG";
|
|||||||
|
|
||||||
find_compiler;
|
find_compiler;
|
||||||
|
|
||||||
|
build_config=`bash $DOWNLOAD_DIR/config.guess`;
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Done!"
|
echo "Done!"
|
||||||
echo
|
echo
|
||||||
@ -333,7 +339,7 @@ echo
|
|||||||
echo "To get started, you should be able to configure and build from"
|
echo "To get started, you should be able to configure and build from"
|
||||||
echo "the top of your cogl source directory as follows:"
|
echo "the top of your cogl source directory as follows:"
|
||||||
echo
|
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 "make"
|
||||||
echo
|
echo
|
||||||
echo "Note: the explicit --build option is often necessary to ensure autoconf"
|
echo "Note: the explicit --build option is often necessary to ensure autoconf"
|
||||||
|
Loading…
Reference in New Issue
Block a user