Merge pull request #2997 from CvH/9.0/wget_fix

fixes $VERBOSE usage
This commit is contained in:
MilhouseVH 2018-09-23 12:30:26 +01:00 committed by GitHub
commit 442e2dea3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@ fi
[ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(which g++)" [ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(which g++)"
# verbose compilation mode (yes/no) # verbose compilation mode (yes/no)
VERBOSE="yes" VERBOSE="${VERBOSE:-yes}"
# Concurrency make level (-j option) # Concurrency make level (-j option)
# Try value 1 (default) to 4 on single CPU computer, or more on # Try value 1 (default) to 4 on single CPU computer, or more on

View File

@ -21,7 +21,7 @@ export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME" PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME"
[ "$VERBOSE" != "yes" ] && WGET_OPT=-q [ "$VERBOSE" != "yes" ] && WGET_OPT=-q
WGET_CMD="wget --output-file=- --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c --progress=bar:force --show-progress -O $PACKAGE" WGET_CMD="wget --output-file=- --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT --progress=bar:force --show-progress -O $PACKAGE"
# unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries # unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH