Diff

Differences From Artifact [d7025f1b94]:

To Artifact [1bf5b7b587]:


    72     72   		fi
    73     73   
    74     74   		# Remove previous directory's "tclConfig.sh" if found
    75     75   		rm -f 'tclConfig.sh'
    76     76   
    77     77   		cd "${BUILDDIR}/${dir}" || exit 1
    78     78   
           79  +		echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" ${CONFIGUREEXTRA}"
    79     80   		./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" ${CONFIGUREEXTRA}
    80     81   
           82  +		echo "Running: ${MAKE:-make}"
    81     83   		${MAKE:-make} || continue
    82     84   
           85  +		echo "Running: ${MAKE:-make} install"
    83     86   		${MAKE:-make} install || (
    84     87   			# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
    85     88   			# cross-compile installs
    86     89   
           90  +			echo "Running: ${MAKE:-make} install TCLSH_NATIVE=\"${TCLKIT:-tclkit}\""
    87     91   			${MAKE:-make} install TCLSH_NATIVE="${TCLKIT:-tclkit}"
    88     92   		) || (
    89     93   			# Make install can fail if cross-compiling using Tcl 8.5.x
    90     94   			# because the Makefile calls "$(TCLSH)".  We can't simply
    91     95   			# redefine TCLSH because it also uses TCLSH as a build target
    92     96   			sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
    93     97   			cat Makefile.new > Makefile
    94     98   			rm -f Makefile.new
    95     99   
          100  +			echo "Running: ${MAKE:-make} install TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\""
    96    101   			${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
    97    102   		) || (
    98    103   			# Make install can fail if cross-compiling using Tcl 8.5.9
    99    104   			# because the Makefile calls "${TCL_EXE}".  We can't simply
   100    105   			# redefine TCL_EXE because it also uses TCL_EXE as a build target
   101    106   			sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
   102    107   			cat Makefile.new > Makefile
   103    108   			rm -f Makefile.new
   104    109   
          110  +			echo "Running: ${MAKE:-make} install TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\""
   105    111   			${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
   106    112   		) || exit 1
   107    113   
   108    114   		mkdir "${OUTDIR}/lib" || exit 1
   109    115   		cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
   110    116   		rm -rf "${OUTDIR}/lib/pkgconfig"
   111    117   		rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null