Overview
| Comment: | Better handling of "--disable-stubs" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ea6fb9ca3b0e505bce735a7f1c329c25 |
| User & Date: | rkeene on 2019-08-08 17:58:23 |
| Other Links: | manifest | tags |
Context
|
2019-08-15
| ||
| 19:30 | Correct tDOM archive hash check-in: 6e1940c326 user: rkeene tags: trunk | |
|
2019-08-08
| ||
| 17:58 | Better handling of "--disable-stubs" check-in: ea6fb9ca3b user: rkeene tags: trunk | |
| 17:57 | Added SHA256 for TUAPI check-in: fb4239c342 user: rkeene tags: trunk | |
Changes
Modified common/common.sh from [00b0b4f987] to [d6e02d73c4].
| ︙ | ︙ | |||
145 146 147 148 149 150 151 |
function preconfigure() {
:
}
function configure() {
local tryopts tryopt
local staticpkg staticpkgvar
| | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 |
function preconfigure() {
:
}
function configure() {
local tryopts tryopt
local staticpkg staticpkgvar
local isshared disable_stubs
local save_cflags
local base_var kc_var
local configure_opt configure_opts configure_opts_new
local ignore_opt ignore_this_opt
# Determine if the user decided this should be static or not
staticpkgvar="$(echo "STATIC${internalpkgname}" | dd conv=ucase 2>/dev/null)"
|
| ︙ | ︙ | |||
210 211 212 213 214 215 216 217 |
if [ "${isshared}" = '0' ]; then
pkg_configure_shared_build='0'
else
pkg_configure_shared_build='1'
fi
if [ "${isshared}" = '0' ]; then
| > | > | > > > > | 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 242 |
if [ "${isshared}" = '0' ]; then
pkg_configure_shared_build='0'
else
pkg_configure_shared_build='1'
fi
disable_stubs='0'
if [ "${isshared}" = '0' ]; then
tryopt="${tryopt} --enable-static"
disable_stubs='1'
fi
if ! grep '[-]-disable-stubs' configure >/dev/null 2>/dev/null; then
if [ "${disable_stubs}" = '1' ]; then
sed 's@USE_TCL_STUBS@XXX_TCL_STUBS@g' configure > configure.new
else
sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' configure > configure.new
fi
cat configure.new > configure
rm -f configure.new
else
if [ "${disable_stubs}" = '1' ]; then
tryopt="${tryopt} --disable-stubs"
fi
fi
configure_opts=($tryopt --prefix="${installdir}" --exec-prefix="${installdir}" --libdir="${installdir}/lib" --with-tcl="${TCLCONFIGDIR}" "${configure_extra[@]}" ${CONFIGUREEXTRA})
configure_opts_new=()
for configure_opt in "${configure_opts[@]}"; do
ignore_this_opt='0'
for ignore_opt in "${pkg_ignore_opts[@]}"; do
|
| ︙ | ︙ |