Overview
Comment: | Fixed issues with TLS package building |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5445171e4590dda4d23760bed51698fb |
User & Date: | rkeene on 2016-09-06 06:46:49 |
Other Links: | manifest | tags |
Context
2016-09-06
| ||
06:59 | More work to make TLS work on more platforms check-in: d940453a88 user: rkeene tags: trunk | |
06:46 | Fixed issues with TLS package building check-in: 5445171e45 user: rkeene tags: trunk | |
06:41 | Updated to not build apps when building LibreSSL check-in: ecd9d4b125 user: rkeene tags: trunk | |
Changes
Modified tls/build.sh from [9ed7019fb3] to [8520dac550].
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 | ) || return 1 SSLDIR="$(pwd)/libressl-${version}/INST" addlibs_LOCALSSL="$(PKG_CONFIG_PATH="${SSLDIR}/lib/pkgconfig" "${PKG_CONFIG:-pkg-config}" libssl libcrypto --libs --static)" } function preconfigure() { # Determine SSL directory if [ -z "${CPP}" ]; then CPP="${CC:-cc} -E" fi if [ -n "${KC_TLS_SSLDIR}" ]; then SSLDIR="${KC_TLS_SSLDIR}" | > > > > > > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | ) || return 1 SSLDIR="$(pwd)/libressl-${version}/INST" addlibs_LOCALSSL="$(PKG_CONFIG_PATH="${SSLDIR}/lib/pkgconfig" "${PKG_CONFIG:-pkg-config}" libssl libcrypto --libs --static)" } function preconfigure() { # Disable SSLv2, newer SSL libraries drop support for it entirely CFLAGS="${CFLAGS} -DNO_SSL2=1" # Disable SSLv3, newer SSL libraries drop support for it entirely CFLAGS="${CFLAGS} -DNO_SSL3=1" # Determine SSL directory if [ -z "${CPP}" ]; then CPP="${CC:-cc} -E" fi if [ -n "${KC_TLS_SSLDIR}" ]; then SSLDIR="${KC_TLS_SSLDIR}" |
︙ | ︙ | |||
70 71 72 73 74 75 76 | if [ -z "${SSLDIR}" ]; then echo "Unable to find OpenSSL, aborting." >&2 return 1 fi fi | < < | < < | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | if [ -z "${SSLDIR}" ]; then echo "Unable to find OpenSSL, aborting." >&2 return 1 fi fi # Add SSL library to configure options configure_extra=(--with-ssl-dir="${SSLDIR}") } function postconfigure() { local linkaddfile local addlibs # Determine SSL library directory |
︙ | ︙ |