mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-11-09 20:57:26 +01:00
0552c37fea
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
35 lines
1.1 KiB
Docker
35 lines
1.1 KiB
Docker
WORKDIR /usr/share
|
|
RUN git clone "https://github.com/nojhan/liquidprompt.git" && \
|
|
cd liquidprompt && \
|
|
git checkout v_1.11
|
|
COPY imagefiles/.bashrc /root/
|
|
|
|
WORKDIR /usr/src
|
|
|
|
COPY imagefiles/install-openssl.sh imagefiles/install-cmake.sh /dockcross/
|
|
RUN \
|
|
if [ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ]; then \
|
|
/dockcross/install-openssl.sh -32 && \
|
|
/dockcross/install-cmake.sh -32 || exit 1; \
|
|
else \
|
|
/dockcross/install-openssl.sh && \
|
|
/dockcross/install-cmake.sh || exit 1; \
|
|
fi; \
|
|
rm /dockcross/install-openssl.sh /dockcross/install-cmake.sh
|
|
|
|
RUN git clone "https://github.com/ninja-build/ninja.git" && \
|
|
cd ninja && \
|
|
git checkout v1.7.1 && \
|
|
([ -e /opt/python/cp35-cp35m/bin/python ] && /opt/python/cp35-cp35m/bin/python ./configure.py --bootstrap) || python ./configure.py --bootstrap && \
|
|
./ninja && \
|
|
cp ./ninja /usr/bin/ && \
|
|
cd .. && rm -rf ninja
|
|
COPY imagefiles/cmake.sh /usr/local/bin/cmake
|
|
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
|
|
|
|
RUN echo "root:root" | chpasswd
|
|
WORKDIR /work
|
|
ENTRYPOINT ["/dockcross/entrypoint.sh"]
|
|
|
|
COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/
|