brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: remove env.sh generated by mingw-fetch-dependencies.sh

Browse Source 
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.
This commit is contained in:
Robert Bragg 2011-03-15 23:28:27 +00:00
parent 5faf7666ec
commit 4dc8ccf9ea
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build/mingw/mingw-fetch-dependencies.sh
View File

@ -184,8 +184,7 @@ function do_cross_compile ()
local builddir="$BUILD_DIR/$dep"; local builddir="$BUILD_DIR/$dep";
cd "$builddir" cd "$builddir"
. $ROOT_DIR/share/env.sh ./configure --prefix="$ROOT_DIR" --host="$TARGET" --target="$TARGET" --build="`./config.guess`" CFLAGS="-mms-bitfields" PKG_CONFIG_PATH="$ROOT_DIR/lib/pkgconfig"
./configure --prefix="$ROOT_DIR" --host="$TARGET" --target="$TARGET" --build="`./config.guess`"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "Failed to configure $dep"; echo "Failed to configure $dep";
@ -317,37 +316,8 @@ done;
# Build environment # Build environment
## ##
env_file="$ROOT_DIR/share/env.sh";
echo "Writing build environment script to $env_file";
echo "#!/bin/bash" > "$env_file";
find_compiler; 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 # Build source dependencies
## ##