Commit 06e413f9 authored by Bernd Machenschalk's avatar Bernd Machenschalk
Browse files

E@H build: fix zlib source handling

parent a86785c2
......@@ -428,14 +428,11 @@ elif test -z "$noupdate"; then
fi
if test ."$build_zlib" = ."true"; then
if test -z "$rebuild" -a -d "$zlib"; then
if test -z "$rebuild" -a -f "$zlib.tar.gz"; then
log_and_show "using existing zlib source"
elif test -z "$noupdate"; then
log_and_show "retrieving $zlib"
download $zlib.tar.gz
log_and_do cd "$BUILD"
log_and_do tar xzf "$SOURCE/$zlib.tar.gz"
log_and_do cd "$SOURCE"
fi
fi
......@@ -488,7 +485,9 @@ if test ."$build_zlib" = ."true"; then
log_and_show "using existing zlib"
else
log_and_show "compiling zlib"
log_and_do cd "$BUILD/$zlib"
log_and_do cd "$BUILD"
log_and_do tar xzf "$SOURCE/$zlib.tar.gz"
log_and_do cd "$zlib"
if [ "$zlib_shared" = "--shared" -a "$zlib" = "zlib-1.2.3" ] && echo "$CFLAGS" | grep -w -e -m64 >/dev/null; then
CC="gcc -m64" log_and_do "./configure" $zlib_shared --prefix="$INSTALL"
else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment