Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [274d569e46] to [e980cfaf2c].

   122    122   AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
   123    123   	DC_SETUP_TCL_PLAT_DEFS
   124    124   
   125    125   	for proj in mk4tcl tcl tclvfs tk; do
   126    126   		AC_MSG_CHECKING([for libraries required for ${proj}])
   127    127   
   128    128   		libdir="../../../${proj}/inst"
   129         -		libfiles="`find "${libdir}" -name '*.a' | grep -v 'stub' | tr "\n" ' '`"
          129  +		libfiles="`find "${libdir}" -name '*.a' | tr "\n" ' '`"
          130  +		libfilesnostub="`find "${libdir}" -name '*.a' | grep -v 'stub' | tr "\n" ' '`"
   130    131   
   131    132   		ARCHS="${ARCHS} ${libfiles}"
   132    133   
   133    134   		AC_MSG_RESULT([${libfiles}])
   134    135   
   135         -		if test "${libfiles}" != ""; then
          136  +		if test "${libfilesnostub}" != ""; then
   136    137   			if test "${proj}" = "mk4tcl"; then
   137    138   				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
   138    139   				DC_DO_STATIC_LINK_LIBCXX
   139    140   			fi
   140    141   			if test "${proj}" = "tk"; then
   141    142   				DC_DO_TK
   142    143   				AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk])

Modified tcl/build.sh from [5c0e5e63d0] to [6599bcea65].

    60     60   
    61     61   		cd "${BUILDDIR}/${dir}" || exit 1
    62     62   
    63     63   		./configure --disable-shared --prefix="${INSTDIR}" ${CONFIGUREEXTRA}
    64     64   
    65     65   		${MAKE:-make} || continue
    66     66   
    67         -		${MAKE:-make} install
           67  +		${MAKE:-make} install || (
           68  +			# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
           69  +			# cross-compile installs
           70  +
           71  +			${MAKE:-make} install TCLSH_NATIVE="${TCLKIT:-tclkit}"
           72  +		) || (
           73  +			# Make install can fail if cross-compiling using Tcl 8.5.x
           74  +			# because the Makefile calls "$(TCLSH)".  We can't simply
           75  +			# redefine TCLSH because it also uses TCLSH as a build target
           76  +			sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
           77  +			cat Makefile.new > Makefile
           78  +			rm -f Makefile.new
           79  +
           80  +			${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
           81  +		)
    68     82   
    69     83   		mkdir "${OUTDIR}/lib" || exit 1
    70     84   		cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
    71     85   		rm -rf "${OUTDIR}/lib/pkgconfig"
    72     86   		rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null
    73     87   		find "${OUTDIR}" -name '*.a' | xargs rm -f >/dev/null 2>/dev/null
    74     88   
    75     89   		break
    76     90   	done
    77     91   ) || exit 1
    78     92   
    79     93   exit 0