Overview
Comment: | Hacked in static linking to libssl if we built a static archive |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6155fc4201c7e7faf1a585d5c149146e |
User & Date: | rkeene on 2015-01-20 18:11:49 |
Other Links: | manifest | tags |
Context
2015-01-20
| ||
19:10 | Added better hack for linking to SSL library statically check-in: 33b255b77a user: rkeene tags: trunk | |
18:11 | Hacked in static linking to libssl if we built a static archive check-in: 6155fc4201 user: rkeene tags: trunk | |
18:02 | Updated to disable SSLv2 in the TLS build script check-in: d5793ac87e user: rkeene tags: trunk | |
Changes
Modified tls/build.sh from [3c6f8c4aef] to [e7c0e6436b].
︙ | ︙ | |||
137 138 139 140 141 142 143 144 145 146 147 148 149 | # Create pkgIndex if needed if [ ! -e "${INSTDIR}/lib/tls${TLSVERS}/pkgIndex.tcl" ]; then cat << _EOF_ > "${INSTDIR}/lib/tls${TLSVERS}/pkgIndex.tcl" package ifneeded tls ${TLSVERS} \ "[list source [file join \$dir tls.tcl]] ; \ [list load {} tls]" _EOF_ fi # Install files needed by installation cp -r "${INSTDIR}/lib" "${OUTDIR}" || exit 1 find "${OUTDIR}" -name '*.a' -type f | xargs -n 1 rm -f -- | > > > > > < < < | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | # Create pkgIndex if needed if [ ! -e "${INSTDIR}/lib/tls${TLSVERS}/pkgIndex.tcl" ]; then cat << _EOF_ > "${INSTDIR}/lib/tls${TLSVERS}/pkgIndex.tcl" package ifneeded tls ${TLSVERS} \ "[list source [file join \$dir tls.tcl]] ; \ [list load {} tls]" _EOF_ ## XXX: TODO: Determine what we actually need to link against echo '-Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic' > "${INSTDIR}/lib/tls${TLSVERS}/libtls${TLSVERS}.a.linkadd" else ## XXX: TODO: Determine what we actually need to link against echo '-lssl -lcrypto' > "${INSTDIR}/lib/tls${TLSVERS}/libtls${TLSVERS}.a.linkadd" fi # Install files needed by installation cp -r "${INSTDIR}/lib" "${OUTDIR}" || exit 1 find "${OUTDIR}" -name '*.a' -type f | xargs -n 1 rm -f -- exit 0 ) || exit 1 exit 0 |