From 4dc8ccf9eab6d360fc208a32d1516bfd9efbddd0 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Tue, 15 Mar 2011 23:28:27 +0000
Subject: [PATCH] win32: remove env.sh generated by mingw-fetch-dependencies.sh

Since there is very little now left in the env.sh file generated by
mingw-fetch-dependencies.sh it can be removed. What remained (The
CFLAGS="-mms-bitfields" and PKG_CONFIG_PATH=$ROOT_DIR/lib/pkgconfig) can
simply be passed explicitly when calling ./configure.
---
 build/mingw/mingw-fetch-dependencies.sh | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh
index 0e81de2..276f97a 100755
--- a/build/mingw/mingw-fetch-dependencies.sh
+++ b/build/mingw/mingw-fetch-dependencies.sh
@@ -184,8 +184,7 @@ function do_cross_compile ()
     local builddir="$BUILD_DIR/$dep";
 
     cd "$builddir"
-    . $ROOT_DIR/share/env.sh
-    ./configure --prefix="$ROOT_DIR" --host="$TARGET" --target="$TARGET" --build="`./config.guess`"
+    ./configure --prefix="$ROOT_DIR" --host="$TARGET" --target="$TARGET" --build="`./config.guess`" CFLAGS="-mms-bitfields" PKG_CONFIG_PATH="$ROOT_DIR/lib/pkgconfig"
 
     if [ "$?" -ne 0 ]; then
 	echo "Failed to configure $dep";
@@ -317,37 +316,8 @@ done;
 # Build environment
 ##
 
-env_file="$ROOT_DIR/share/env.sh";
-echo "Writing build environment script to $env_file";
-echo "#!/bin/bash" > "$env_file";
-
 find_compiler;
 
-add_env PKG_CONFIG_PATH "$ROOT_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH";
-
-add_env CFLAGS "-mms-bitfields \$CFLAGS"
-
-cat >> "$env_file" <<EOF
-export ROOT_DIR="$ROOT_DIR";
-export TARGET="$TARGET";
-
-function do_autogen()
-{
-  ./autogen.sh --prefix="\$ROOT_DIR" --host="\$TARGET" --target="\$TARGET" \\
-    --with-flavour=win32;
-}
-
-# If any arguments are given then execute it as a program with the
-# environment we set up
-
-if test "\$#" -ge 1; then
-    exec "\$@";
-fi;
-
-EOF
-
-chmod a+x "$env_file";
-
 ##
 # Build source dependencies
 ##
-- 
2.7.4