Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-10 04:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

common.docker: Improve OpenSSL and CMake install introducing helper scripts

Browse Source 
To accommodate the requirements associated with x86 and x64 images, the
command building OpenSSL and CMake became overly complex and hard to
maintain.

This commit has multiple purposes:

(1) simplify common.docker

(2) fix the building of 64-bit shared libraries against the static openssl
libraries by passing the -fPIC flag.

(3) ensure [many]linux-x86 and [many]linux-x64 images have an up-to-date
OpenSSL install. Openssl static libraries are installed in /usr

(4) simplify and speedup CMake build avoiding the second build with
explicit -DCMAKE_USE_OPENSSL:BOOL=ON. Indeed, configuring CMake on Linux
already looks for OpenSSL.

(5) speedup download of CMake source directly downloading the archive
corresponding to the revision.

(6) test CMake by:
  - running CMake.FileDownload test
  - trying to download a file served over https
This commit is contained in:
Jean-Christophe Fillion-Robin
2016-11-21 06:08:30 -05:00
parent 70de0f9856
commit 0552c37fea
7 changed files with 198 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
linux-x86/Dockerfile
View File

@ -9,8 +9,7 @@ RUN dpkg --add-architecture i386 && \
libstdc++6:i386 \
libbz2-dev:i386 \
libexpat1-dev:i386 \
ncurses-dev:i386 \
libssl-dev:i386
ncurses-dev:i386
ENV CROSS_TRIPLE i686-linux-gnu
ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
@ -34,6 +33,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
COPY install-openssl.sh /dockcross/
RUN \
/dockcross/install-openssl.sh -32 && \
rm /dockcross/install-openssl.sh
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-x86
# Note: Toolchain file support is currently in debian Experimental: