From 3e83b9de739964f52b87e24d648091b084a1cf30 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 8 Jan 2021 09:40:33 +0800 Subject: tcl: upgrade 8.6.10 -> 8.6.11 0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch removed since it is included in 8.6.11 refresh alter-includedir.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...dd2-Failed-to-build-tk-8.6.10-with-cross-.patch | 44 --------- .../tcltk/tcl/alter-includedir.patch | 29 +++--- meta/recipes-devtools/tcltk/tcl_8.6.10.bb | 106 --------------------- meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 104 ++++++++++++++++++++ 4 files changed, 119 insertions(+), 164 deletions(-) delete mode 100644 meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch delete mode 100644 meta/recipes-devtools/tcltk/tcl_8.6.10.bb create mode 100644 meta/recipes-devtools/tcltk/tcl_8.6.11.bb (limited to 'meta') diff --git a/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch b/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch deleted file mode 100644 index 3cd34155ee..0000000000 --- a/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f7fa48c4c75a1e748dc5071e709c0b62ff739eaa Mon Sep 17 00:00:00 2001 -From: "jan.nijtmans" -Date: Mon, 9 Dec 2019 10:02:20 +0000 -Subject: [PATCH] Fix [abd4abedd2]: Failed to build tk 8.6.10 with cross - compile - -Upstream-Status: Backport -[https://github.com/tcltk/tcl/commit/f7fa48c4c75a1e748dc5071e709c0b62ff739eaa] - -Signed-off-by: Yi Zhao ---- - compat/strtol.c | 2 +- - compat/strtoul.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/compat/strtol.c b/compat/strtol.c -index b7f69196c..811006a64 100644 ---- a/compat/strtol.c -+++ b/compat/strtol.c -@@ -53,7 +53,7 @@ strtol( - */ - - p = string; -- while (TclIsSpaceProc(*p)) { -+ while (isspace(UCHAR(*p))) { - p += 1; - } - -diff --git a/compat/strtoul.c b/compat/strtoul.c -index e37eb05f8..15587f1da 100644 ---- a/compat/strtoul.c -+++ b/compat/strtoul.c -@@ -74,7 +74,7 @@ strtoul( - */ - - p = string; -- while (TclIsSpaceProc(*p)) { -+ while (isspace(UCHAR(*p))) { - p += 1; - } - if (*p == '-') { --- -2.17.1 - diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 86632d9144..66c395d401 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -1,4 +1,4 @@ -Lets install the include header and private header files into +Lets install the include header and private header files into usr/include/tcl8.6 when version of tcl is 8.6.x Upstream-Status: Inappropriate [Configuration Specific] @@ -9,18 +9,19 @@ Fixed the TCL_INCLUDE_SPEC Signed-off-by: Robert Yang Signed-off-by: Yi Zhao + --- - Makefile.in | 2 +- - configure | 4 ++-- - configure.in | 4 ++-- + Makefile.in | 2 +- + configure | 4 ++-- + configure.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 97b983b..dc2a4df 100644 +index 0370491..daa569a 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -53,7 +53,7 @@ DLL_INSTALL_DIR = @DLL_INSTALL_DIR@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) +@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) + MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 # Directory in which to install the include file tcl.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -29,10 +30,10 @@ index 97b983b..dc2a4df 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ diff --git a/configure b/configure -index 3e78b49..24b3f92 100755 +index 181b9b3..f4cc225 100755 --- a/configure +++ b/configure -@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' @@ -41,7 +42,7 @@ index 3e78b49..24b3f92 100755 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -19293,7 +19293,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir @@ -51,10 +52,10 @@ index 3e78b49..24b3f92 100755 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name diff --git a/configure.in b/configure.in -index 0e28b14..62d9b41 100755 +index 9f96e2b..e323e02 100644 --- a/configure.in +++ b/configure.in -@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' @@ -63,7 +64,7 @@ index 0e28b14..62d9b41 100755 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -912,7 +912,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir @@ -73,5 +74,5 @@ index 0e28b14..62d9b41 100755 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name -- -1.7.10.4 +2.25.1 diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb deleted file mode 100644 index e6feb25a7e..0000000000 --- a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY = "Tool Command Language" -HOMEPAGE = "http://tcl.sourceforge.net" -SECTION = "devel/tcltk" - -# http://www.tcl.tk/software/tcltk/license.html -LICENSE = "tcl & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ -" - -DEPENDS = "tcl-native zlib" - -BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ - file://tcl-add-soname.patch" -SRC_URI = "${BASE_SRC_URI} \ - file://fix_non_native_build_issue.patch \ - file://fix_issue_with_old_distro_glibc.patch \ - file://no_packages.patch \ - file://tcl-remove-hardcoded-install-path.patch \ - file://alter-includedir.patch \ - file://0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch;patchdir=.. \ - file://run-ptest \ -" -SRC_URI[md5sum] = "97c55573f8520bcab74e21bfd8d0aadc" -SRC_URI[sha256sum] = "5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed" - -SRC_URI_class-native = "${BASE_SRC_URI}" - -S = "${WORKDIR}/${BPN}${PV}/unix" - -PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}" -VER = "${PV}" - -inherit autotools ptest binconfig update-alternatives - -EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" - -do_compile_prepend() { - echo > ${S}/../compat/fixstrtod.c -} - -do_install() { - autotools_do_install - oe_runmake 'DESTDIR=${D}' install-private-headers - ln -sf ./tclsh${VER} ${D}${bindir}/tclsh - ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} - sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh - sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tclConfig.sh - install -d ${D}${bindir_crossscripts} - install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} - install -m 0755 tclConfig.sh ${D}${libdir} - for dir in compat generic unix; do - install -d ${D}${includedir}/${BPN}${VER}/$dir - install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ - done -} - -SYSROOT_DIRS += "${bindir_crossscripts}" - -PACKAGES =+ "tcl-lib" -FILES_tcl-lib = "${libdir}/libtcl8.6.so.*" -FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" -FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" - -ALTERNATIVE_${PN}-doc = "Thread.3" -ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" - -# isn't getting picked up by shlibs code -RDEPENDS_${PN} += "tcl-lib" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}-ptest += "libgcc" - -BBCLASSEXTEND = "native nativesdk" - -do_compile_ptest() { - oe_runmake tcltest -} - -do_install_ptest() { - cp ${B}/tcltest ${D}${PTEST_PATH} - cp -r ${S}/../library ${D}${PTEST_PATH} - cp -r ${S}/../tests ${D}${PTEST_PATH} -} - -# Fix some paths that might be used by Tcl extensions -BINCONFIG_GLOB = "*Config.sh" - -# Fix the path in sstate -SSTATE_SCAN_FILES += "*Config.sh" - -# Cleanup host path from ${libdir}/tclConfig.sh and remove the -# ${bindir_crossscripts}/tclConfig.sh from target -PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" -tcl_package_preprocess() { - sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ - -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ - -e "s;${STAGING_INCDIR};${includedir};g" \ - -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ - ${PKGD}${libdir}/tclConfig.sh - - rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh -} diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb new file mode 100644 index 0000000000..74bdb098c6 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb @@ -0,0 +1,104 @@ +SUMMARY = "Tool Command Language" +HOMEPAGE = "http://tcl.sourceforge.net" +SECTION = "devel/tcltk" + +# http://www.tcl.tk/software/tcltk/license.html +LICENSE = "tcl & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://../compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://../library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://../macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://../tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://../win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ +" + +DEPENDS = "tcl-native zlib" + +BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ + file://tcl-add-soname.patch" +SRC_URI = "${BASE_SRC_URI} \ + file://fix_non_native_build_issue.patch \ + file://fix_issue_with_old_distro_glibc.patch \ + file://no_packages.patch \ + file://tcl-remove-hardcoded-install-path.patch \ + file://alter-includedir.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258" + +SRC_URI_class-native = "${BASE_SRC_URI}" + +S = "${WORKDIR}/${BPN}${PV}/unix" + +PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}" +VER = "${PV}" + +inherit autotools ptest binconfig update-alternatives + +EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" + +do_compile_prepend() { + echo > ${S}/../compat/fixstrtod.c +} + +do_install() { + autotools_do_install + oe_runmake 'DESTDIR=${D}' install-private-headers + ln -sf ./tclsh${VER} ${D}${bindir}/tclsh + ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} + sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh + sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tclConfig.sh + install -d ${D}${bindir_crossscripts} + install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} + install -m 0755 tclConfig.sh ${D}${libdir} + for dir in compat generic unix; do + install -d ${D}${includedir}/${BPN}${VER}/$dir + install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ + done +} + +SYSROOT_DIRS += "${bindir_crossscripts}" + +PACKAGES =+ "tcl-lib" +FILES_tcl-lib = "${libdir}/libtcl8.6.so.*" +FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" +FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" + +ALTERNATIVE_${PN}-doc = "Thread.3" +ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" + +# isn't getting picked up by shlibs code +RDEPENDS_${PN} += "tcl-lib" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}-ptest += "libgcc" + +BBCLASSEXTEND = "native nativesdk" + +do_compile_ptest() { + oe_runmake tcltest +} + +do_install_ptest() { + cp ${B}/tcltest ${D}${PTEST_PATH} + cp -r ${S}/../library ${D}${PTEST_PATH} + cp -r ${S}/../tests ${D}${PTEST_PATH} +} + +# Fix some paths that might be used by Tcl extensions +BINCONFIG_GLOB = "*Config.sh" + +# Fix the path in sstate +SSTATE_SCAN_FILES += "*Config.sh" + +# Cleanup host path from ${libdir}/tclConfig.sh and remove the +# ${bindir_crossscripts}/tclConfig.sh from target +PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" +tcl_package_preprocess() { + sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ + -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ + -e "s;${STAGING_INCDIR};${includedir};g" \ + -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + ${PKGD}${libdir}/tclConfig.sh + + rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh +} -- cgit 1.2.3-korg