Changes In Branch win32-install Excluding Merge-Ins
This is equivalent to a diff from 71bd41f921 to 685cc32776
|
2016-07-08
| ||
| 19:41 | Updated to support building our own libSSL (LibreSSL) if none is available or if requested (KC_TLS_BUILDSSL) check-in: 3defed1bc3 user: rkeene tags: trunk | |
|
2016-06-29
| ||
| 02:46 | Add Fossil 'keep-glob' setting to prevent the downloaded files from being cleaned. Leaf check-in: 685cc32776 user: mistachkin tags: win32-install | |
| 01:19 | Merge updates from trunk. check-in: e29b34acd1 user: mistachkin tags: win32-install | |
|
2016-05-13
| ||
| 02:00 | Fix to build of TCL_UTF_MAX check-in: 71bd41f921 user: rkeene tags: trunk | |
| 01:54 | Added TCL_UTF_MAX=6 build support check-in: fe4c8bd979 user: rkeene tags: trunk | |
Added .fossil-settings/keep-glob version [3e8c711866].
> | 1 | */src/*.gz |
Modified tcl/build.sh from [24178e9f3f] to [72e6b1e1d8].
| ︙ | ︙ | |||
238 239 240 241 242 243 244 |
# Remove broken pre-generated Makfiles
rm -f GNUmakefile Makefile makefile
echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" ${CONFIGUREEXTRA}"
./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" ${CONFIGUREEXTRA}
| | | | | | | | | | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 |
# Remove broken pre-generated Makfiles
rm -f GNUmakefile Makefile makefile
echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" ${CONFIGUREEXTRA}"
./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make} binaries"
${MAKE:-make} binaries || continue
echo "Running: ${MAKE:-make} install-binaries install-libraries"
${MAKE:-make} install-binaries install-libraries || (
# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
# cross-compile installs
echo "Running: ${MAKE:-make} install-binaries install-libraries TCLSH_NATIVE=\"${TCLSH_NATIVE}\""
${MAKE:-make} install-binaries install-libraries TCLSH_NATIVE="${TCLSH_NATIVE}"
) || (
# Make install can fail if cross-compiling using Tcl 8.5.x
# because the Makefile calls "$(TCLSH)". We can't simply
# redefine TCLSH because it also uses TCLSH as a build target
sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
cat Makefile.new > Makefile
rm -f Makefile.new
echo "Running: ${MAKE:-make} install-binaries install-libraries TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
${MAKE:-make} install-binaries install-libraries TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
) || (
# Make install can fail if cross-compiling using Tcl 8.5.9
# because the Makefile calls "${TCL_EXE}". We can't simply
# redefine TCL_EXE because it also uses TCL_EXE as a build target
sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
cat Makefile.new > Makefile
rm -f Makefile.new
echo "Running: ${MAKE:-make} install-binaries install-libraries TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")\""
${MAKE:-make} install-binaries install-libraries TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLSH_NATIVE}")"
) || exit 1
mkdir "${OUTDIR}/lib" || exit 1
cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
rm -rf "${OUTDIR}/lib/pkgconfig"
rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null
find "${OUTDIR}" -name '*.a' | xargs rm -f >/dev/null 2>/dev/null
|
| ︙ | ︙ |