From 4b791501ed1aa506c3109891d21cae170cc38fd9 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 1 Dec 2010 12:42:48 -0800 Subject: tcl: upgrade from 8.5.8 to 8.5.9 Rebased this patch to the newer upstream code. modified: fix_non_native_build_issue.patch Deleted following patch as the newer upstream code includes it already. deleted: tcl/mips-tclstrtod.patch tcl: update checksums Signed-off-by: Nitin A Kamble --- .../tcltk/tcl/fix_non_native_build_issue.patch | 46 +++++++-------- .../tcltk/tcl/mips-tclstrtod.patch | 28 ---------- meta/recipes-devtools/tcltk/tcl_8.5.8.bb | 63 --------------------- meta/recipes-devtools/tcltk/tcl_8.5.9.bb | 65 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 114 deletions(-) delete mode 100644 meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch delete mode 100644 meta/recipes-devtools/tcltk/tcl_8.5.8.bb create mode 100644 meta/recipes-devtools/tcltk/tcl_8.5.9.bb (limited to 'meta/recipes-devtools/tcltk') diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index b2d98c131c..0b8b26cae2 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -2,62 +2,62 @@ Index: unix/Makefile.in =================================================================== --- unix.orig/Makefile.in +++ unix/Makefile.in -@@ -622,20 +622,20 @@ ro-test: tcltest - shell: tclsh +@@ -619,20 +619,20 @@ ro-test: tcltest@EXEEXT@ + shell: ${TCL_EXE} @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -- ./tclsh $(SCRIPT) -+ tclsh $(SCRIPT) +- ./${TCL_EXE} $(SCRIPT) ++ ${TCL_EXE} $(SCRIPT) # This target can be used to run tclsh inside either gdb or insight - gdb: tclsh + gdb: ${TCL_EXE} @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run -- $(GDB) ./tclsh --command=gdb.run -+ $(GDB) tclsh --command=gdb.run +- $(GDB) ./${TCL_EXE} --command=gdb.run ++ $(GDB) ${TCL_EXE} --command=gdb.run rm gdb.run # This target can be used to run tclsh inside ddd - ddd: tclsh + ddd: ${TCL_EXE} @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run -- $(DDD) -command=gdb.run ./tclsh -+ $(DDD) -command=gdb.run tclsh +- $(DDD) -command=gdb.run ./${TCL_EXE} ++ $(DDD) -command=gdb.run ${TCL_EXE} rm gdb.run VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v -@@ -648,7 +648,7 @@ valgrind: tclsh tcltest - valgrindshell: tclsh +@@ -645,7 +645,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@ + valgrindshell: ${TCL_EXE} @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -- valgrind $(VALGRINDARGS) ./tclsh $(SCRIPT) -+ valgrind $(VALGRINDARGS) tclsh $(SCRIPT) +- valgrind $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) ++ valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) # The following target outputs the name of the top-level source directory for # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL -@@ -817,14 +817,14 @@ install-tzdata: tclsh +@@ -809,14 +809,14 @@ install-tzdata: ${TCL_EXE} @echo "Installing time zone data" @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -- ./tclsh $(TOOL_DIR)/installData.tcl \ -+ tclsh $(TOOL_DIR)/installData.tcl \ +- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ ++ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata - install-msgs: tclsh + install-msgs: ${TCL_EXE} @echo "Installing message catalogs" @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -- ./tclsh $(TOOL_DIR)/installData.tcl \ -+ tclsh $(TOOL_DIR)/installData.tcl \ +- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ ++ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs install-doc: doc -@@ -1764,7 +1764,7 @@ html-tk: tclsh +@@ -1756,7 +1756,7 @@ html-tk: ${TCL_EXE} BUILD_HTML = \ @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -- ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ -+ tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ +- ./${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ ++ ${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # diff --git a/meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch b/meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch deleted file mode 100644 index c1e0d63324..0000000000 --- a/meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch +++ /dev/null @@ -1,28 +0,0 @@ -http://sourceforge.net/tracker/index.php?func=detail&aid=2902010&group_id=10894&atid=110894 - -Pulled from OE by: Saul Wold - ---- ../generic/tclStrToD.c.orig -+++ ../generic/tclStrToD.c -@@ -71,9 +71,10 @@ - - /* - * MIPS floating-point units need special settings in control registers -- * to use gradual underflow as we expect. -+ * to use gradual underflow as we expect. This fix is for the MIPSpro -+ * compiler. - */ --#if defined(__mips) -+#if defined(__sgi) && defined(_COMPILER_VERSION) - #include - #endif - /* -@@ -2166,7 +2167,7 @@ - } bitwhack; - #endif - --#if defined(__mips) -+#if defined(__sgi) && defined(_COMPILER_VERSION) - union fpc_csr mipsCR; - - mipsCR.fc_word = get_fpc_csr(); diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.8.bb b/meta/recipes-devtools/tcltk/tcl_8.5.8.bb deleted file mode 100644 index 1edb57bf0d..0000000000 --- a/meta/recipes-devtools/tcltk/tcl_8.5.8.bb +++ /dev/null @@ -1,63 +0,0 @@ -DESCRIPTION = "Tool Command Language" -LICENSE = "tcl" -SECTION = "devel/tcltk" -HOMEPAGE = "http://tcl.sourceforge.net" -DEPENDS = "tcl-native" -LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ - file://../compat/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ - file://../library/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ - file://../macosx/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ - file://../tests/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ - file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ - " - -PR = "r4" - -BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ - file://tcl-add-soname.patch" - -SRC_URI = "${BASE_SRC_URI} \ - file://fix_non_native_build_issue.patch \ - file://mips-tclstrtod.patch;striplevel=0" - -SRC_URI_virtclass-native = "${BASE_SRC_URI}" - -S = "${WORKDIR}/tcl${PV}/unix" - -inherit autotools - -DEPENDS_virtclass-native = "" - -EXTRA_OECONF = "--enable-threads" - -do_configure() { - gnu-configize - oe_runconf -} - -do_compile_prepend() { - echo > ../compat/fixstrtod.c -} - -do_install() { - autotools_do_install - oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR} - ln -sf ./tclsh8.5 ${D}${bindir}/tclsh - sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh - sed -i "s,-L${libdir},," tclConfig.sh - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS} - cd .. - for dir in compat generic unix - do - install -d ${STAGING_INCDIR}/tcl${PV}/$dir - install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/ - done -} - -PACKAGES =+ "${PN}-lib" -FILES_${PN}-lib = "${libdir}/libtcl8.5.so*" -FILES_${PN} += "${libdir}/tcl8.5" -FILES_${PN}-dev += "${libdir}/tclConfig.sh" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb new file mode 100644 index 0000000000..aa1805b861 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "Tool Command Language" +LICENSE = "tcl" +SECTION = "devel/tcltk" +HOMEPAGE = "http://tcl.sourceforge.net" +DEPENDS = "tcl-native" +LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ + file://../compat/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ + file://../library/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ + file://../macosx/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ + file://../tests/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ + file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ + " + +PR = "r0" + +BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ + file://tcl-add-soname.patch" + +SRC_URI = "${BASE_SRC_URI} \ + file://fix_non_native_build_issue.patch " + +SRC_URI[md5sum] = "8512d8db3233041dd68a81476906012a" +SRC_URI[sha256sum] = "3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d" + +SRC_URI_virtclass-native = "${BASE_SRC_URI}" + +S = "${WORKDIR}/tcl${PV}/unix" + +inherit autotools + +DEPENDS_virtclass-native = "" + +EXTRA_OECONF = "--enable-threads" + +do_configure() { + gnu-configize + oe_runconf +} + +do_compile_prepend() { + echo > ../compat/fixstrtod.c +} + +do_install() { + autotools_do_install + oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR} + ln -sf ./tclsh8.5 ${D}${bindir}/tclsh + sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh + sed -i "s,-L${libdir},," tclConfig.sh + install -d ${STAGING_BINDIR_CROSS}/ + install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS} + cd .. + for dir in compat generic unix + do + install -d ${STAGING_INCDIR}/tcl${PV}/$dir + install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/ + done +} + +PACKAGES =+ "${PN}-lib" +FILES_${PN}-lib = "${libdir}/libtcl8.5.so*" +FILES_${PN} += "${libdir}/tcl8.5" +FILES_${PN}-dev += "${libdir}/tclConfig.sh" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf