Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-03 13:44:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74 from jcfr/base-image-fix-install-openssl

Browse Source 
base: Fix building of OpenSSL. See #73
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-11-20 14:10:32 -05:00 committed by GitHub
commit 70de0f9856
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.docker
View File

@ -10,8 +10,8 @@ WORKDIR /usr/src
RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \ RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \
tar -xzvf openssl-1.0.2j.tar.gz && \ tar -xzvf openssl-1.0.2j.tar.gz && \
cd openssl-1.0.2j && \ cd openssl-1.0.2j && \
WRAPPER=$( [ $DEFAULT_DOCKCROSS_IMAGE = "dockcross/manylinux-x86" ] && echo "linux32" || echo "") && \ WRAPPER=$( [ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ] && echo "linux32" || echo "") && \
CONFIG_FLAG=$( [ $DEFAULT_DOCKCROSS_IMAGE = "dockcross/manylinux-x86" ] && echo "-m32" || echo "") && \ CONFIG_FLAG=$( [ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ] && echo "-m32" || echo "") && \
${WRAPPER} ./config --prefix=/usr $CONFIG_FLAG && \ ${WRAPPER} ./config --prefix=/usr $CONFIG_FLAG && \
${WRAPPER} make && \ ${WRAPPER} make && \
( \ ( \
@ -35,7 +35,7 @@ RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \
-DOPENSSL_ROOT_DIR:PATH=/usr/src/openssl-1.0.2j \ -DOPENSSL_ROOT_DIR:PATH=/usr/src/openssl-1.0.2j \
. && \ . && \
${WRAPPER} make install && \ ${WRAPPER} make install && \
cd .. && rm -rf CMake* && rm -rf /usr/src/openssl-1.0.2j cd .. && rm -rf CMake* && rm -rf /usr/src/openssl-1.0.2j*
RUN git clone "https://github.com/ninja-build/ninja.git" && \ RUN git clone "https://github.com/ninja-build/ninja.git" && \
cd ninja && \ cd ninja && \