Overview
| Comment: | Updated to try to use pkg-config to determine additional libraries for libssl |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
8edfc5151b1a73b319b41abf7b633f1b |
| User & Date: | rkeene on 2016-07-08 21:56:32 |
| Other Links: | manifest | tags |
Context
|
2016-07-08
| ||
| 22:00 | Updated to support building libssl from the WebUI check-in: 8082796226 user: rkeene tags: trunk | |
| 21:56 | Updated to try to use pkg-config to determine additional libraries for libssl check-in: 8edfc5151b user: rkeene tags: trunk | |
| 21:36 | Disable SSLv3 from our TclTLS builds -- newer versions of LibSSL no longer support it check-in: cac6170c7a user: rkeene tags: trunk | |
Changes
Modified tls/build.sh from [33f65977be] to [82518c6710].
| ︙ | ︙ | |||
75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
${MAKE:-make} V=1 || exit 1
echo "Running: ${MAKE:-make} V=1 install"
${MAKE:-make} V=1 install || exit 1
) || return 1
SSLDIR="$(pwd)/libressl-${version}/INST"
}
(
cd 'build' || exit 1
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
| > | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 |
${MAKE:-make} V=1 || exit 1
echo "Running: ${MAKE:-make} V=1 install"
${MAKE:-make} V=1 install || exit 1
) || return 1
SSLDIR="$(pwd)/libressl-${version}/INST"
addlibs="$(PKG_CONFIG_PATH="$(pwd)/libressl-${version}/INST/lib/pkgconfig" "${PKG_CONFIG:-pkg-config}" libssl libcrypto --libs --static)"
}
(
cd 'build' || exit 1
if [ ! -d '../buildsrc' ]; then
gzip -dc "../${SRC}" | tar -xf -
|
| ︙ | ︙ | |||
214 215 216 217 218 219 220 |
# Determine name of static object
LINKADDFILE="$(find "${INSTDIR}" -name '*.a' | head -n 1)"
if [ -n "${LINKADDFILE}" ]; then
LINKADDFILE="${LINKADDFILE}.linkadd"
## XXX: TODO: Determine what we actually need to link against
| > > > > > > > > > | > > > > | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 |
# Determine name of static object
LINKADDFILE="$(find "${INSTDIR}" -name '*.a' | head -n 1)"
if [ -n "${LINKADDFILE}" ]; then
LINKADDFILE="${LINKADDFILE}.linkadd"
## XXX: TODO: Determine what we actually need to link against
if [ -z "${addlibs}" ]; then
if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
addlibs="$("${PKG_CONFIG:-pkg-config}" libssl libcrypto --libs --static)"
else
addlibs="$("${PKG_CONFIG:-pkg-config}" libssl libcrypto --libs)"
fi
fi
if [ -z "${addlibs}" ]; then
addlibs="-L${SSL_LIB_DIR:-/lib} -lssl -lcrypto"
addlibs_staticOnly=""
fi
addlibs="${addlibs} ${KC_TLS_LINKADD}"
if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
echo "-Wl,-Bstatic ${addlibs} ${addlibs_staticOnly} -Wl,-Bdynamic"
else
echo "${addlibs}"
fi > "${LINKADDFILE}"
fi
|
| ︙ | ︙ |