Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-09 20:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
No known key found for this signature in database
GPG Key ID: BAF1E1AEB9097A41
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imagefiles/build-and-install-openssl.sh
View File

@ -23,7 +23,7 @@ set -ex
set -o pipefail set -o pipefail
WRAPPER="" WRAPPER=""
CONFIG_FLAG="-fPIC" CONFIG_FLAG=""
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
@ -70,11 +70,13 @@ function build_openssl {
check_var ${openssl_sha256} check_var ${openssl_sha256}
check_var ${OPENSSL_DOWNLOAD_URL} check_var ${OPENSSL_DOWNLOAD_URL}
# Can't use curl here because we don't have it yet # 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} check_sha256sum ${openssl_fname}.tar.gz ${openssl_sha256}
tar -xzf ${openssl_fname}.tar.gz tar -xzf ${openssl_fname}.tar.gz
(cd ${openssl_fname} && do_openssl_build) (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 cd /usr/src

12
imagefiles/install-cmake-binary.sh
View File

@ -17,17 +17,17 @@ if [[ "${CMAKE_VERSION}" == "" ]]; then
exit 1 exit 1
fi fi
cd /tmp cd /usr/src
filename=cmake-${CMAKE_VERSION}-Centos5-x86_64 CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-x86_64
url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${filename}.tar.gz url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz
echo "Downloading $url" echo "Downloading $url"
curl -# -LO $url curl -# -LO $url
tar -xzvf ${filename}.tar.gz tar -xzvf ${CMAKE_ROOT}.tar.gz
rm -f ${filename}.tar.gz rm -f ${CMAKE_ROOT}.tar.gz
cd ${filename} cd ${CMAKE_ROOT}
rm -rf doc man rm -rf doc man
rm -rf bin/cmake-gui rm -rf bin/cmake-gui