Index: itcl/build.sh ================================================================== --- itcl/build.sh +++ itcl/build.sh @@ -80,14 +80,17 @@ esac sed 's@TEA_PLATFORM=@test -z "$TEA_PLATFORM" \&\& &@' configure > configure.new && cat configure.new > configure rm -f configure.new # Build + echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} + echo "Running: ${MAKE:-make}" ${MAKE:-make} || exit 1 + echo "Running: ${MAKE:-make} install" ${MAKE:-make} install mkdir "${OUTDIR}/lib" || exit 1 cp -r "${INSTDIR}/lib"/itcl*/ "${OUTDIR}/lib/" Index: kitsh/build.sh ================================================================== --- kitsh/build.sh +++ kitsh/build.sh @@ -64,18 +64,20 @@ ## Export to the environment, to be picked up by the "configure" script export EXTRA_OBJS # Compile Kitsh if [ -z "${ZLIBDIR}" ]; then - echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" + echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} else - echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" --with-zlib=\"${ZLIBDIR}\" ${CONFIGUREEXTRA}" + echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" --with-zlib=\"${ZLIBDIR}\" ${CONFIGUREEXTRA}" ./configure --with-tcl="${TCLCONFIGDIR}" --with-zlib="${ZLIBDIR}" ${CONFIGUREEXTRA} fi + + echo "Running: ${MAKE:-make}" ${MAKE:-make} || exit 1 # Strip the kit of all symbols, if possible "${STRIP:-strip}" kit >/dev/null 2>/dev/null Index: mk4tcl/build.sh ================================================================== --- mk4tcl/build.sh +++ mk4tcl/build.sh @@ -67,11 +67,14 @@ CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1" export CPPFLAGS fi # Build static libraries for linking against Tclkit + echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}" ./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA} + + echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\"" ${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" && \ ${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || ( rm -rf "${INSTDIR}" mkdir "${INSTDIR}" Index: tcl/build.sh ================================================================== --- tcl/build.sh +++ tcl/build.sh @@ -74,36 +74,42 @@ # Remove previous directory's "tclConfig.sh" if found rm -f 'tclConfig.sh' cd "${BUILDDIR}/${dir}" || exit 1 + echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" ${CONFIGUREEXTRA}" ./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" ${CONFIGUREEXTRA} + echo "Running: ${MAKE:-make}" ${MAKE:-make} || continue + echo "Running: ${MAKE:-make} install" ${MAKE:-make} install || ( # Work with Tcl 8.6.x's TCLSH_NATIVE solution for # cross-compile installs + echo "Running: ${MAKE:-make} install TCLSH_NATIVE=\"${TCLKIT:-tclkit}\"" ${MAKE:-make} install TCLSH_NATIVE="${TCLKIT:-tclkit}" ) || ( # 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 TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\"" ${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")" ) || ( # 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 TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\"" ${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")" ) || exit 1 mkdir "${OUTDIR}/lib" || exit 1 cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/" Index: tclvfs/build.sh ================================================================== --- tclvfs/build.sh +++ tclvfs/build.sh @@ -70,12 +70,17 @@ CFLAGS="${CFLAGS} -I${TCLCONFIGDIR}" export CFLAGS fi # Build static version + echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} + + echo "Running: ${MAKE:-make}" ${MAKE:-make} || exit 1 + + echo "Running: ${MAKE:-make} install" ${MAKE:-make} install mkdir "${OUTDIR}/lib" || exit 1 cp -r "${INSTDIR}/lib"/vfs*/ "${OUTDIR}/lib/" rm -f "${OUTDIR}/lib"/vfs*/*.a "${OUTDIR}/lib"/vfs*/*.so Index: thread/build.sh ================================================================== --- thread/build.sh +++ thread/build.sh @@ -63,14 +63,17 @@ else cp -rp ../buildsrc/* './' fi cd "${BUILDDIR}" || exit 1 + echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} + echo "Running: ${MAKE:-make}" ${MAKE:-make} || exit 1 + echo "Running: ${MAKE:-make} install" ${MAKE:-make} install mkdir "${OUTDIR}/lib" || exit 1 cp -r "${INSTDIR}/lib"/thread*/ "${OUTDIR}/lib/" Index: tk/build.sh ================================================================== --- tk/build.sh +++ tk/build.sh @@ -90,12 +90,14 @@ else echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA} fi + echo "Running: ${MAKE:-make}" ${MAKE:-make} || continue + echo "Running: ${MAKE:-make} install" ${MAKE:-make} install || continue # Update to include resources, if found if [ "${dir}" = "win" ]; then echo ' *** Creating tkbase.res.o to support Windows build' Index: zlib/build.sh ================================================================== --- zlib/build.sh +++ zlib/build.sh @@ -44,16 +44,19 @@ AR="${AR:-ar} rcu" export AR # We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf # script and will puke + echo "Running: ./configure --prefix=\"${INSTDIR}\"" ./configure --prefix="${INSTDIR}" + echo "Running: ${MAKE:-make} AR=\"${AR}\"" ${MAKE:-make} AR="${AR}" || exit 1 + echo "Running: ${MAKE:-make} install AR=\"${AR}\"" ${MAKE:-make} install AR="${AR}" # We don't really care too much about failure in zlib exit 0 ) || exit 1 exit 0