KitCreator
Check-in [8901d151f8]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Updated to try harder to link to libssl when building TclTLS
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8901d151f869c0dfd5e7800472fd7141a061d22f
User & Date: rkeene on 2017-02-14 02:10:39
Other Links: manifest | tags
Context
2017-02-20
14:54
Merged in setting Tcl Module paths check-in: 4a78bcbd8a user: rkeene tags: trunk
2017-02-14
02:10
Updated to try harder to link to libssl when building TclTLS check-in: 8901d151f8 user: rkeene tags: trunk
2016-12-28
21:42
Updated to NSF 2.1.0 release check-in: e0ab1dd8a7 user: ssoberni tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified tls/build.sh from [bd7a663580] to [c86aceaa03].

︙︙
45
46
47
48
49
50
51
52
53
54
55



56
57
58
59
60
61
62

_EOF_

		${MAKE:-make} V=1 || exit 1

		${MAKE:-make} V=1 install || exit 1
	) || return 1

	PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${SSLDIR}/lib/pkgconfig"
	export PKG_CONFIG_PATH

	SSLDIR="$(pwd)/libressl-${version}/INST"




	return 0
}

function preconfigure() {
	# Determine SSL directory
	if [ -z "${CPP}" ]; then








|
|


>
>
>








45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65

_EOF_

		${MAKE:-make} V=1 || exit 1

		${MAKE:-make} V=1 install || exit 1
	) || return 1

	# We always statically link
	KC_TLS_LINKSSLSTATIC='1'

	SSLDIR="$(pwd)/libressl-${version}/INST"

	PKG_CONFIG_PATH="${SSLDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}"
	export PKG_CONFIG_PATH

	return 0
}

function preconfigure() {
	# Determine SSL directory
	if [ -z "${CPP}" ]; then
︙︙
81
82
83
84
85
86
87






88
89
90
91
92
93
94
95
96
97
98


			return 1
		fi
	fi

	# Add SSL library to configure options
	configure_extra=("${configure_extra[@]}" --with-openssl-dir="${SSLDIR}")






}

function postinstall() {
	for file in *.linkadd; do
		if [ ! -e "${file}" ]; then
			continue
		fi

		cp "${file}" "${installdir}/lib"/*/
	done
}








>
>
>
>
>
>












84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107


			return 1
		fi
	fi

	# Add SSL library to configure options
	configure_extra=("${configure_extra[@]}" --with-openssl-dir="${SSLDIR}")

	# If we are statically linking to libssl, let tcltls know so it asks for the right
	# packages
	if [ "${KC_TLS_LINKSSLSTATIC}" = '1' ]; then
		configure_extra=("${configure_extra[@]}" --enable-static-ssl)
	fi
}

function postinstall() {
	for file in *.linkadd; do
		if [ ! -e "${file}" ]; then
			continue
		fi

		cp "${file}" "${installdir}/lib"/*/
	done
}

Powered by Fossil · RSS