build-and-install-openssl.sh, install-cmake-binary.sh: Tweak install scripts

* Consistently use "/usr/src" as download and staging area

* install-cmake-binary: Introduce CMAKE_ROOT var

* build-and-install-openssl: Remove redundant -fPIC flag, download openssl sources using "wget"
This commit is contained in:
Jean-Christophe Fillion-Robin
2018-06-05 13:02:12 -04:00
parent b5f967af66
commit f1a8f69f4d
2 changed files with 11 additions and 9 deletions

View File

@@ -23,7 +23,7 @@ set -ex
set -o pipefail
WRAPPER=""
CONFIG_FLAG="-fPIC"
CONFIG_FLAG=""
while [ $# -gt 0 ]; do
case "$1" in
@@ -70,11 +70,13 @@ function build_openssl {
check_var ${openssl_sha256}
check_var ${OPENSSL_DOWNLOAD_URL}
# Can't use curl here because we don't have it yet
curl -# -LO ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz
wget -q ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz
check_sha256sum ${openssl_fname}.tar.gz ${openssl_sha256}
tar -xzf ${openssl_fname}.tar.gz
(cd ${openssl_fname} && do_openssl_build)
rm -rf ${openssl_fname} ${openssl_fname}.tar.gz /usr/ssl/man
rm -rf ${openssl_fname} ${openssl_fname}.tar.gz
# Cleanup install tree
rm -rf /usr/ssl/man
}
cd /usr/src