Check-in [6155fc4201]
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:6155fc4201c7e7faf1a585d5c149146ecea8f351
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    137   	# Create pkgIndex if needed
   138    138   	if [ ! -e "${INSTDIR}/lib/tls${TLSVERS}/pkgIndex.tcl" ]; then
   139    139   		cat << _EOF_ > "${INSTDIR}/lib/tls${TLSVERS}/pkgIndex.tcl"
   140    140   package ifneeded tls ${TLSVERS} \
   141    141       "[list source [file join \$dir tls.tcl]] ; \
   142    142        [list load {} tls]"
   143    143   _EOF_
          144  +		## XXX: TODO: Determine what we actually need to link against
          145  +		echo '-Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic' > "${INSTDIR}/lib/tls${TLSVERS}/libtls${TLSVERS}.a.linkadd"
          146  +	else
          147  +		## XXX: TODO: Determine what we actually need to link against
          148  +		echo '-lssl -lcrypto' > "${INSTDIR}/lib/tls${TLSVERS}/libtls${TLSVERS}.a.linkadd"
   144    149   	fi
   145    150   
   146    151   	# Install files needed by installation
   147    152   	cp -r "${INSTDIR}/lib" "${OUTDIR}" || exit 1
   148    153   	find "${OUTDIR}" -name '*.a' -type f | xargs -n 1 rm -f --
   149    154   
   150         -	## XXX: TODO: Determine what we actually need to link against
   151         -	echo '-lssl -lcrypto' > "${INSTDIR}/lib/tls${TLSVERS}/libtls${TLSVERS}.a.linkadd"
   152         -
   153    155   	exit 0
   154    156   ) || exit 1
   155    157   
   156    158   exit 0