Check-in [466fa75705]
Overview
Comment:Switched Tk and Itcl to dynamic linking
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:466fa757057e96862d4255e2821520cc9f3f4dc8
User & Date: rkeene on 2010-09-26 04:37:08
Other Links: manifest | tags
Context
2010-09-26
04:37
Updated to build shared objects of Mk4tcl and Tclvfs

Added memchan package (needed for tclvfs) check-in: a66d18a60b user: rkeene tags: trunk

04:37
Switched Tk and Itcl to dynamic linking check-in: 466fa75705 user: rkeene tags: trunk
04:37
Added kitcreator check-in: fcf0977f4c user: rkeene tags: trunk
Changes

Modified itcl/build.sh from [27ec74bd27] to [62e0471051].

    31     31   
    32     32   (
    33     33   	cd 'build' || exit 1
    34     34   
    35     35   	gzip -dc "../${SRC}" | tar -xf -
    36     36   
    37     37   	cd "${BUILDDIR}" || exit 1
    38         -	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           38  +	./configure --enable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    39     39   
    40     40   	"${MAKE:-make}" || exit 1
    41     41   
    42     42   	"${MAKE:-make}" install
    43     43   
    44     44   	mkdir "${OUTDIR}/lib" || exit 1
    45     45   	cp -r "${INSTDIR}/lib"/itcl*/ "${OUTDIR}/lib/"
    46         -	rm -f "${OUTDIR}/lib"/itcl*/*.a
    47     46   ) || exit 1
    48     47   
    49     48   exit 0

Modified tk/build.sh from [65b4c2995f] to [bd63ad37a9].

    35     35   	cd "${BUILDDIR}" || exit 1
    36     36   	for dir in unix win macosx; do
    37     37   		# Remove previous directory's "tkConfig.sh" if found
    38     38   		rm -f 'tkConfig.sh'
    39     39   
    40     40   		cd "${BUILDDIR}/${dir}" || exit 1
    41     41   
    42         -		./configure --disable-shared --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           42  +		./configure --enable-shared --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    43     43   
    44     44   		"${MAKE:-make}" || continue
    45     45   
    46     46   		"${MAKE:-make}" install
           47  +
           48  +		# Update pkgIndex to load libtk from the local directory rather
           49  +		# than the parent directory
           50  +		for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
           51  +			sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
           52  +			mv "${pkgIndex}.new" "${pkgIndex}"
           53  +		done
    47     54   
    48     55   		mkdir "${OUTDIR}/lib" || exit 1
    49     56   		cp -r "${INSTDIR}/lib"/tk*/ "${OUTDIR}/lib/"
           57  +		cp -r "${INSTDIR}/lib"/libtk* "${OUTDIR}/lib"/tk*/
    50     58   
    51     59   		break
    52     60   	done
    53     61   ) || exit 1
    54     62   
    55     63   exit 0