Jean-Christophe Fillion-Robin
|
4bb8f97ffc
|
common.docker: Ensure openssl-1.0.2j is available in manylinux and linux images
If images are any of manylinux-x86, manylinux-x64, linux-x86 or linux-x64,
OpenSSL libraries are installed in /usr .
|
2016-11-18 15:30:03 -05:00 |
|
Matt McCormick
|
b54dbfd9cf
|
base: Improve openssl build for i686
Avoid bash-isms.
Also return true from the sub-shell.
|
2016-11-06 10:13:08 -05:00 |
|
Jean-Christophe Fillion-Robin
|
3b6e09b520
|
manylinux-x86: Fix build of Openssl and CMake
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
```
|
2016-11-05 17:55:58 -04:00 |
|
Jean-Christophe Fillion-Robin
|
6f7e7b05fd
|
common.docker: Fix CMake https download building it against openssl 1.0.2j
See #63
|
2016-11-05 11:25:42 -04:00 |
|
Matt McCormick
|
b3feda218b
|
base: Bump CMake for improved add_custom_command
Improves cross-compilation support in add_custom_command by integrating
https://gitlab.kitware.com/cmake/cmake/merge_requests/217
CMake Git master from 2016-11-03 (3.8-master).
Addresses #54
|
2016-11-03 12:38:25 -04:00 |
|
Matt McCormick
|
b1037c9f5f
|
manylinux-x64,base: Download cmake binary for SSL support
Download the CMake binary from CMake.org for SSL support. #39
|
2016-09-21 20:25:02 -04:00 |
|
Matt McCormick
|
b596ca6cd8
|
base,manylinux-x64: Use sed for Dockerfile composition
Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
|
2016-09-20 18:08:43 -04:00 |
|
Matt McCormick
|
5d90a72dfc
|
manylinux-x64: Initial addition
|
2016-09-20 18:07:58 -04:00 |
|
Matt McCormick
|
755f45b412
|
base: Split into Dockerfile.in and common.docker
So common.docker can be re-used in other images that are not built FROM base.
|
2016-09-20 08:58:41 -04:00 |
|