Overview
| Comment: | Fixed issue with static linking of TLS when also building a local static executable |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
20deaf934eb20e457c87546ea9ddb2a2 |
| User & Date: | rkeene on 2016-09-06 15:21:11 |
| Other Links: | manifest | tags |
Context
|
2016-09-06
| ||
| 15:28 | Corrected typo in last commit check-in: d491db9c95 user: rkeene tags: trunk | |
| 15:21 | Fixed issue with static linking of TLS when also building a local static executable check-in: 20deaf934e user: rkeene tags: trunk | |
| 14:29 | Improved compiling CMake-based yajl for yajltcl check-in: 71be3ff1a1 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [b344f06840] to [ca463da686].
| ︙ | ︙ | |||
210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 |
projlibfilesnostub=''
fi
if test "$projlibfiles" = ' '; then
projlibfiles=''
fi
for libfile in ${projlibfilesnostub}; do
if test -f "${libfile}.linkadd"; then
projlibextra="`cat "${libfile}.linkadd"`"
fi
done
AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
hide_symbols="1"
if test "${proj}" = "tcl"; then
DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
projlibfiles="${projlibfilesnostub}"
], [
| > > > > > > > > > > > | 210 211 212 213 214 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 |
projlibfilesnostub=''
fi
if test "$projlibfiles" = ' '; then
projlibfiles=''
fi
projlibextra_static=''
for libfile in ${projlibfilesnostub}; do
if test -f "${libfile}.linkadd"; then
projlibextra="`cat "${libfile}.linkadd"`"
dnl Replace static linking requests with the appropriate values
if echo "${projlibextra}" | grep '^#STATIC ' >/dev/null; then
projlibextra_static="${projlibextra_static} `echo "${projlibextra}" | sed 's@^#STATIC @@'`"
projlibextra=''
fi
fi
done
AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
if [ -n "${projlibextra_static}" ]; then
DC_DO_STATIC_LINK_LIB([Additional libraries for ${proj}], ${projlibextra_static})
fi
hide_symbols="1"
if test "${proj}" = "tcl"; then
DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
projlibfiles="${projlibfilesnostub}"
], [
|
| ︙ | ︙ |
Modified tls/build.sh from [1f2a192f9a] to [e69d6c7eca].
| ︙ | ︙ | |||
130 131 132 133 134 135 136 |
addlibs="-L${SSL_LIB_DIR:-/lib} -lssl -lcrypto"
addlibs_staticOnly=""
fi
addlibs="${addlibs} ${KC_TLS_LINKADD}"
if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
| | | 130 131 132 133 134 135 136 137 138 139 140 141 142 |
addlibs="-L${SSL_LIB_DIR:-/lib} -lssl -lcrypto"
addlibs_staticOnly=""
fi
addlibs="${addlibs} ${KC_TLS_LINKADD}"
if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
echo "#STATIC ${addlibs} ${addlibs_staticOnly}"
else
echo "${addlibs}"
fi > "${linkaddfile}"
fi
}
|