Overview
Comment: | Updated to try harder to link to libssl when building TclTLS |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 8901d151f869c0dfd5e7800472fd7141a061d22f |
User & Date: | rkeene on 2017-02-14 02:10:39 |
Other Links: | manifest | tags |
Context
2017-02-20
| ||
14:54 | Merged in setting Tcl Module paths check-in: 4a78bcbd8a user: rkeene tags: trunk | |
2017-02-14
| ||
02:10 | Updated to try harder to link to libssl when building TclTLS check-in: 8901d151f8 user: rkeene tags: trunk | |
2016-12-28
| ||
21:42 | Updated to NSF 2.1.0 release check-in: e0ab1dd8a7 user: ssoberni tags: trunk | |
Changes
Modified tls/build.sh from [bd7a663580] to [c86aceaa03].
45 45 _EOF_ 46 46 47 47 ${MAKE:-make} V=1 || exit 1 48 48 49 49 ${MAKE:-make} V=1 install || exit 1 50 50 ) || return 1 51 51 52 - PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${SSLDIR}/lib/pkgconfig" 53 - export PKG_CONFIG_PATH 52 + # We always statically link 53 + KC_TLS_LINKSSLSTATIC='1' 54 54 55 55 SSLDIR="$(pwd)/libressl-${version}/INST" 56 + 57 + PKG_CONFIG_PATH="${SSLDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}" 58 + export PKG_CONFIG_PATH 56 59 57 60 return 0 58 61 } 59 62 60 63 function preconfigure() { 61 64 # Determine SSL directory 62 65 if [ -z "${CPP}" ]; then ................................................................................ 81 84 82 85 return 1 83 86 fi 84 87 fi 85 88 86 89 # Add SSL library to configure options 87 90 configure_extra=("${configure_extra[@]}" --with-openssl-dir="${SSLDIR}") 91 + 92 + # If we are statically linking to libssl, let tcltls know so it asks for the right 93 + # packages 94 + if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then 95 + configure_extra=("${configure_extra[@]}" --enable-static-ssl) 96 + fi 88 97 } 89 98 90 99 function postinstall() { 91 100 for file in *.linkadd; do 92 101 if [ ! -e "${file}" ]; then 93 102 continue 94 103 fi 95 104 96 105 cp "${file}" "${installdir}/lib"/*/ 97 106 done 98 107 }