Check-in [cdb34a8a59]
Overview
Comment:Updated to support cross-compiling Tcl 8.5.9
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:cdb34a8a59cf54a4de726288445da673d5c281df
User & Date: rkeene on 2010-09-26 04:46:25
Other Links: manifest | tags
Context
2010-09-26
04:46
Fixed bug with zlib static linking check-in: 91b460f024 user: rkeene tags: trunk
04:46
Updated to support cross-compiling Tcl 8.5.9 check-in: cdb34a8a59 user: rkeene tags: trunk
04:46
Updated to remove duplicate library references when linking in Tk check-in: 82f72a0dcd user: rkeene tags: trunk
Changes

Modified tcl/build.sh from [1ef9a6bcc4] to [d7025f1b94].

    90     90   			# because the Makefile calls "$(TCLSH)".  We can't simply
    91     91   			# redefine TCLSH because it also uses TCLSH as a build target
    92     92   			sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
    93     93   			cat Makefile.new > Makefile
    94     94   			rm -f Makefile.new
    95     95   
    96     96   			${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
           97  +		) || (
           98  +			# Make install can fail if cross-compiling using Tcl 8.5.9
           99  +			# because the Makefile calls "${TCL_EXE}".  We can't simply
          100  +			# redefine TCL_EXE because it also uses TCL_EXE as a build target
          101  +			sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
          102  +			cat Makefile.new > Makefile
          103  +			rm -f Makefile.new
          104  +
          105  +			${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
    97    106   		) || exit 1
    98    107   
    99    108   		mkdir "${OUTDIR}/lib" || exit 1
   100    109   		cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
   101    110   		rm -rf "${OUTDIR}/lib/pkgconfig"
   102    111   		rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null
   103    112   		find "${OUTDIR}" -name '*.a' | xargs rm -f >/dev/null 2>/dev/null