mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-11-13 22:51:31 +01:00
3b6e09b520
This commit fixes the error reported below by ensuring openssl and CMake
are configured and build as x86 binaries.
It also removes the download of CMake binaries that was introduced
by mistake in 1354fe2 (manylinux-x86: Initial addition).
Error:
```
Configured for linux-x86_64.
making all in crypto...
make[1]: Entering directory `/usr/src/openssl-1.0.2j/crypto'
/usr/bin/perl ../util/mkbuildinf.pl "gcc -I. -I.. -I../include -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM" "linux-x86_64" >buildinf.h
gcc -I. -I.. -I../include -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -c -o cryptlib.o cryptlib.c
cryptlib.c:1:0: sorry, unimplemented: 64-bit mode not compiled in
/* crypto/cryptlib.c */
^
make[1]: *** [cryptlib.o] Error 1
```
37 lines
1.0 KiB
Docker
37 lines
1.0 KiB
Docker
FROM quay.io/pypa/manylinux1_i686:latest
|
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
|
|
|
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x86
|
|
|
|
#include "common.docker"
|
|
|
|
#include "common.manylinux"
|
|
|
|
ENV CROSS_TRIPLE i686-linux-gnu
|
|
ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin
|
|
ENV AS=${CROSS_ROOT}/as \
|
|
AR=${CROSS_ROOT}/ar \
|
|
CC=${CROSS_ROOT}/gcc \
|
|
CPP=${CROSS_ROOT}/cpp \
|
|
CXX=${CROSS_ROOT}/g++ \
|
|
LD=${CROSS_ROOT}/ld
|
|
|
|
COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
|
|
|
|
COPY manylinux-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
|
|
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
|
|
|
|
COPY linux-x86/linux32-entrypoint.sh /dockcross/
|
|
ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
|
|
|
|
# Build-time metadata as defined at http://label-schema.org
|
|
ARG BUILD_DATE
|
|
ARG IMAGE
|
|
ARG VCS_REF
|
|
ARG VCS_URL
|
|
LABEL org.label-schema.build-date=$BUILD_DATE \
|
|
org.label-schema.name=$IMAGE \
|
|
org.label-schema.vcs-ref=$VCS_REF \
|
|
org.label-schema.vcs-url=$VCS_URL \
|
|
org.label-schema.schema-version="1.0"
|