KitCreator
Check-in [33b255b77a]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Added better hack for linking to SSL library statically
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 33b255b77a2b721ebc4de7a61351ef346bf9e139
User & Date: rkeene on 2015-01-20 19:10:03
Other Links: manifest | tags
Context
2015-01-20
19:16
Added web interface knob for statically linking to LibSSL check-in: 1c335dfe36 user: rkeene tags: trunk
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
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified tls/build.sh from [e7c0e6436b] to [f6144b21a4].

︙
137
138
139
140
141
142
143


144
145




146
147
148


149
150
151
152
153
154
155
156

137
138
139
140
141
142
143
144
145


146
147
148
149
150


151
152

153
154
155
156
157
158
159








+
+
-
-
+
+
+
+

-
-
+
+
-








	# 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

		## 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"
	## XXX: TODO: Determine what we actually need to link against
	addlibs="-lssl -lcrypto"
	if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
		echo "-Wl,-Bstatic ${addlibs} -Wl,-Bdynamic"
	else
		## XXX: TODO: Determine what we actually need to link against
		echo '-lssl -lcrypto' > "${INSTDIR}/lib/tls${TLSVERS}/libtls${TLSVERS}.a.linkadd"
		echo "${addlibs}"
	fi > "${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
︙

Powered by Fossil · RSS