* [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives
@ 2021-07-12 13:51 Ross Burton
2021-07-12 13:51 ` [PATCH 2/9] tcl: EXTRA_OECONF already passes --libdir, don't do it again Ross Burton
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
Both Perl and Tcl want to install Thread.3. Alternatives is a terrible
idea for manpages that don't correspond to binaries, instead just tell
Tcl to suffix the manpages so this is Thread.3tcl.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index efb36b32dd..f5bb6b1a18 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -34,9 +34,9 @@ S = "${WORKDIR}/${BPN}${PV}/unix"
PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
VER = "${PV}"
-inherit autotools ptest binconfig update-alternatives
+inherit autotools ptest binconfig
-EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
+EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir} --enable-man-suffix"
do_compile_prepend() {
echo > ${S}/../compat/fixstrtod.c
@@ -65,9 +65,6 @@ 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}-ptest += "libgcc"
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/9] tcl: EXTRA_OECONF already passes --libdir, don't do it again
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 3/9] tcl: mark a patch as upstreamable Ross Burton
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index f5bb6b1a18..b2863f9a1f 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -36,7 +36,7 @@ VER = "${PV}"
inherit autotools ptest binconfig
-EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir} --enable-man-suffix"
+EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix"
do_compile_prepend() {
echo > ${S}/../compat/fixstrtod.c
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/9] tcl: mark a patch as upstreamable
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
2021-07-12 13:51 ` [PATCH 2/9] tcl: EXTRA_OECONF already passes --libdir, don't do it again Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 4/9] tcl: use tcl-core instead of patching out packages Ross Burton
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
No reason this shouldn't be fixed upstream.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../tcltk/tcl/tcl-remove-hardcoded-install-path.patch | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
index 17d251d554..386fbf83d0 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
@@ -7,10 +7,7 @@ Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}.
[YOCTO #2876]
-This is not a bug, but libraries should be installed into directory .../lib/.
-On 64bit target that should be lib64/.
-
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Pending
Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/9] tcl: use tcl-core instead of patching out packages
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
2021-07-12 13:51 ` [PATCH 2/9] tcl: EXTRA_OECONF already passes --libdir, don't do it again Ross Burton
2021-07-12 13:51 ` [PATCH 3/9] tcl: mark a patch as upstreamable Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 5/9] tcl: use AUTOTOOLS_SCRIPT_PATH Ross Burton
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
Instead of patching out the build of optional packages, we can just use
the tcl-core tarball which is identical except it doesn't include the
packages.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../tcltk/tcl/no_packages.patch | 53 -------------------
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 5 +-
2 files changed, 2 insertions(+), 56 deletions(-)
delete mode 100644 meta/recipes-devtools/tcltk/tcl/no_packages.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/meta/recipes-devtools/tcltk/tcl/no_packages.patch
deleted file mode 100644
index 5c622a2369..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/no_packages.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-tcl 8.6.0 builds by default a number of packages that are not needed in Yocto.
-This patch changes the makefile so that these packages are not built by default.
-
-Upstream-Status:Inappropriate [embedded specific]
-
-Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
-
-diff --git a/Makefile.in b/Makefile.in
-index b729ffd..2c2e824 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -612,7 +612,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
- # Start of rules
- #--------------------------------------------------------------------------
-
--all: binaries libraries doc packages
-+all: binaries libraries doc
-
- binaries: ${LIB_FILE} ${TCL_EXE}
-
-@@ -656,12 +656,12 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in
- #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in
- # $(SHELL) config.status
-
--clean: clean-packages
-+clean:
- rm -rf *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \
- errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@
- cd dltest ; $(MAKE) clean
-
--distclean: distclean-packages clean
-+distclean: clean
- rm -rf Makefile config.status config.cache config.log tclConfig.sh \
- tclConfig.h *.plist Tcl.framework tcl.pc
- cd dltest ; $(MAKE) distclean
-@@ -709,7 +709,7 @@ tcltest-real:
- # tcltest, ie:
- # % make test TESTFLAGS="-verbose bps -file fileName.test"
-
--test: test-tcl test-packages
-+test: test-tcl
-
- test-tcl: ${TCLTEST_EXE}
- $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
-@@ -774,7 +774,7 @@ INSTALL_PACKAGE_TARGETS = install-packages
- INSTALL_DEV_TARGETS = install-headers
- INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
- INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
-- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS)
-+ $(INSTALL_EXTRA_TARGETS)
-
- install: $(INSTALL_TARGETS)
-
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index b2863f9a1f..722e4a0132 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -15,17 +15,16 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38
DEPENDS = "tcl-native zlib"
-BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
+BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${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[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa"
SRC_URI_class-native = "${BASE_SRC_URI}"
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/9] tcl: use AUTOTOOLS_SCRIPT_PATH
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
` (2 preceding siblings ...)
2021-07-12 13:51 ` [PATCH 4/9] tcl: use tcl-core instead of patching out packages Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 6/9] tcl: remove redundant file creation Ross Burton
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
Inside tcl the configure.ac is inside a unix/ directory. Instead of
setting S to BPNPV/unix and having to use ../ to reach files outside of
unix, simply set S as usual and use AUTOTOOLS_SCRIPT_PATH to run the
correct configure script.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../tcltk/tcl/alter-includedir.patch | 30 +++----------------
.../tcl/fix_issue_with_old_distro_glibc.patch | 4 +--
.../tcl/fix_non_native_build_issue.patch | 4 +--
.../tcltk/tcl/tcl-add-soname.patch | 22 +++-----------
.../tcl-remove-hardcoded-install-path.patch | 17 ++---------
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 24 +++++++--------
6 files changed, 26 insertions(+), 75 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
index 66c395d401..5b25af2c0c 100644
--- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -18,8 +18,8 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
diff --git a/Makefile.in b/Makefile.in
index 0370491..daa569a 100644
---- a/Makefile.in
-+++ b/Makefile.in
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8
@@ -29,32 +29,10 @@ index 0370491..daa569a 100644
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
-diff --git a/configure b/configure
-index 181b9b3..f4cc225 100755
---- a/configure
-+++ b/configure
-@@ -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)'
--PRIVATE_INCLUDE_DIR='$(includedir)'
-+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
- HTML_DIR='$(DISTDIR)/html'
-
- # Note: in the following variable, it's important to use the absolute
-@@ -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
--eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
-+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
-
- #------------------------------------------------------------------------
- # tclConfig.sh refers to this by a different name
diff --git a/configure.in b/configure.in
index 9f96e2b..e323e02 100644
---- a/configure.in
-+++ b/configure.in
+--- a/unix/configure.in
++++ b/unix/configure.in
@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index 72a0fa4520..2c31cec8e3 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -17,8 +17,8 @@ Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Index: unix/Makefile.in
===================================================================
---- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
-+++ unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
+--- a/unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
++++ b/unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
@@ -686,7 +686,7 @@
# tcltest executable gets the build directory burned into its ld search path.
# This keeps tcltest from picking up an already installed version of the Tcl
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 c60eb75379..44b2ce0a30 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,8 +2,8 @@ Upstream-Status: Pending
Index: unix/Makefile.in
===================================================================
---- unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800
-+++ unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800
+--- a/unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800
++++ b/unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800
@@ -709,23 +709,23 @@
test: test-tcl test-packages
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index d1fc9b92e5..c4283c4f34 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,23 +1,9 @@
Upstream-Status: Pending
-Index: unix/configure
-===================================================================
---- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700
-+++ unix/configure 2013-11-11 00:20:51.519490342 -0800
-@@ -7599,6 +7599,9 @@
- # get rid of the warnings.
- #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-+ # following line added by CW for Debian GNU/Linux
-+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
-+
- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
Index: unix/tcl.m4
===================================================================
---- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700
-+++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
+--- a/unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700
++++ b/unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
@@ -1415,6 +1415,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -30,8 +16,8 @@ Index: unix/tcl.m4
DL_LIBS="-ldl"
Index: unix/Makefile.in
===================================================================
---- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700
-+++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800
+--- a/unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700
++++ b/unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800
@@ -796,7 +796,10 @@
done;
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
index 386fbf83d0..99c5faf02c 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
@@ -17,23 +17,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
configure.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: unix/configure
-===================================================================
---- unix.orig/configure 2013-11-10 23:38:33.643426430 -0800
-+++ unix/configure 2013-11-10 23:39:51.347428387 -0800
-@@ -19134,7 +19134,7 @@
-
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
-
--test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
-
Index: unix/configure.in
===================================================================
---- unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800
-+++ unix/configure.in 2013-11-10 23:39:41.199428131 -0800
+--- a/unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800
++++ b/unix/configure.in 2013-11-10 23:39:41.199428131 -0800
@@ -790,7 +790,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index 722e4a0132..dce0fcd2c0 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -5,12 +5,12 @@ 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 \
+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"
@@ -28,17 +28,17 @@ SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469
SRC_URI_class-native = "${BASE_SRC_URI}"
-S = "${WORKDIR}/${BPN}${PV}/unix"
+S = "${WORKDIR}/${BPN}${PV}"
-PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
VER = "${PV}"
inherit autotools ptest binconfig
+AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix"
do_compile_prepend() {
- echo > ${S}/../compat/fixstrtod.c
+ echo > ${S}/compat/fixstrtod.c
}
do_install() {
@@ -53,7 +53,7 @@ do_install() {
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/
+ install -m 0644 ${S}/$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/
done
}
@@ -76,8 +76,8 @@ do_compile_ptest() {
do_install_ptest() {
cp ${B}/tcltest ${D}${PTEST_PATH}
- cp -r ${S}/../library ${D}${PTEST_PATH}
- cp -r ${S}/../tests ${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
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/9] tcl: remove redundant file creation
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
` (3 preceding siblings ...)
2021-07-12 13:51 ` [PATCH 5/9] tcl: use AUTOTOOLS_SCRIPT_PATH Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 7/9] tcl: detect tests that error as well as fail Ross Burton
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
The creation of compat/fixstrtod.c was done back in 2005[1] with no
explanation and has persisted since. I can't seem to break the build
without this, so it is presumably long obsolete.
[1] https://git.openembedded.org/openembedded/commit/?id=68d6601e8f93243347b58324ce3d4f02eb3a84a9
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 4 ----
1 file changed, 4 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index dce0fcd2c0..0d7c2e4ac3 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -37,10 +37,6 @@ inherit autotools ptest binconfig
AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix"
-do_compile_prepend() {
- echo > ${S}/compat/fixstrtod.c
-}
-
do_install() {
autotools_do_install
oe_runmake 'DESTDIR=${D}' install-private-headers
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/9] tcl: detect tests that error as well as fail
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
` (4 preceding siblings ...)
2021-07-12 13:51 ` [PATCH 6/9] tcl: remove redundant file creation Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 8/9] tcl: clock.test needs a timezone to be set Ross Burton
2021-07-12 13:51 ` [PATCH 9/9] tcl: increase timeouts in interp.test Ross Burton
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
The grep was only looking for tests which explicitly fail, and wasn't
catching tests that error.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-devtools/tcltk/tcl/run-ptest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest
index 22bb69ae0d..6d52f34a9f 100644
--- a/meta/recipes-devtools/tcltk/tcl/run-ptest
+++ b/meta/recipes-devtools/tcltk/tcl/run-ptest
@@ -2,7 +2,7 @@
for i in `ls tests/*.test | awk -F/ '{print $2}'`; do
TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.log 2>&1
- grep -q "^Files with failing tests:" $i.log
+ grep -q -F -e "Files with failing tests:" -e "Test files exiting with errors:" $i.log
if [ $? -eq 0 ]; then
echo "FAIL: $i"
cat $i.log
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 8/9] tcl: clock.test needs a timezone to be set
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
` (5 preceding siblings ...)
2021-07-12 13:51 ` [PATCH 7/9] tcl: detect tests that error as well as fail Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 13:51 ` [PATCH 9/9] tcl: increase timeouts in interp.test Ross Burton
7 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-devtools/tcltk/tcl/run-ptest | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest
index 6d52f34a9f..2406e176ff 100644
--- a/meta/recipes-devtools/tcltk/tcl/run-ptest
+++ b/meta/recipes-devtools/tcltk/tcl/run-ptest
@@ -1,7 +1,11 @@
#!/bin/sh
+# clock.test needs a timezone to be set
+export TZ="Europe/London"
+export TCL_LIRARY=./library
+
for i in `ls tests/*.test | awk -F/ '{print $2}'`; do
- TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.log 2>&1
+ ./tcltest tests/all.tcl -file $i >$i.log 2>&1
grep -q -F -e "Files with failing tests:" -e "Test files exiting with errors:" $i.log
if [ $? -eq 0 ]; then
echo "FAIL: $i"
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 9/9] tcl: increase timeouts in interp.test
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
` (6 preceding siblings ...)
2021-07-12 13:51 ` [PATCH 8/9] tcl: clock.test needs a timezone to be set Ross Burton
@ 2021-07-12 13:51 ` Ross Burton
2021-07-12 16:08 ` [OE-core] " Ross Burton
7 siblings, 1 reply; 10+ messages in thread
From: Ross Burton @ 2021-07-12 13:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-devtools/tcltk/tcl/interp.patch | 23 ++++++++++++++++++++
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 1 +
2 files changed, 24 insertions(+)
create mode 100644 meta/recipes-devtools/tcltk/tcl/interp.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/interp.patch b/meta/recipes-devtools/tcltk/tcl/interp.patch
new file mode 100644
index 0000000000..f33dbb21ac
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/interp.patch
@@ -0,0 +1,23 @@
+Sometimes this test fails, and it appears as if this is because if the system is
+loaded then the 'after 0' and 'after 10' blocks happen in the same iteration of
+the interpretter and are executed in the wrong order.
+
+Increase the timeout on the 10ms interval to 1000ms to be a little more forgiving
+of system load.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/tests/interp.test b/tests/interp.test
+index 385d3e2ab..3b07ce30c 100644
+--- a/tests/interp.test
++++ b/tests/interp.test
+@@ -3599,7 +3599,7 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
+ child eval {
+ variable done {}
+ after 0 error foo
+- after 10 [list ::set [namespace which -variable done] {}]
++ after 1000 [list ::set [namespace which -variable done] {}]
+ vwait [namespace which -variable done]
+ }
+ set result
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index 0d7c2e4ac3..57a86e4c64 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -22,6 +22,7 @@ SRC_URI = "${BASE_SRC_URI} \
file://fix_issue_with_old_distro_glibc.patch \
file://tcl-remove-hardcoded-install-path.patch \
file://alter-includedir.patch \
+ file://interp.patch \
file://run-ptest \
"
SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa"
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH 9/9] tcl: increase timeouts in interp.test
2021-07-12 13:51 ` [PATCH 9/9] tcl: increase timeouts in interp.test Ross Burton
@ 2021-07-12 16:08 ` Ross Burton
0 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2021-07-12 16:08 UTC (permalink / raw)
Cc: OE-core
Hold off this patch, I have a better version incoming.
Ross
On Mon, 12 Jul 2021 at 14:52, Ross Burton via lists.openembedded.org
<ross=burtonini.com@lists.openembedded.org> wrote:
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/recipes-devtools/tcltk/tcl/interp.patch | 23 ++++++++++++++++++++
> meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 1 +
> 2 files changed, 24 insertions(+)
> create mode 100644 meta/recipes-devtools/tcltk/tcl/interp.patch
>
> diff --git a/meta/recipes-devtools/tcltk/tcl/interp.patch b/meta/recipes-devtools/tcltk/tcl/interp.patch
> new file mode 100644
> index 0000000000..f33dbb21ac
> --- /dev/null
> +++ b/meta/recipes-devtools/tcltk/tcl/interp.patch
> @@ -0,0 +1,23 @@
> +Sometimes this test fails, and it appears as if this is because if the system is
> +loaded then the 'after 0' and 'after 10' blocks happen in the same iteration of
> +the interpretter and are executed in the wrong order.
> +
> +Increase the timeout on the 10ms interval to 1000ms to be a little more forgiving
> +of system load.
> +
> +Upstream-Status: Inappropriate
> +Signed-off-by: Ross Burton <ross.burton@arm.com>
> +
> +diff --git a/tests/interp.test b/tests/interp.test
> +index 385d3e2ab..3b07ce30c 100644
> +--- a/tests/interp.test
> ++++ b/tests/interp.test
> +@@ -3599,7 +3599,7 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
> + child eval {
> + variable done {}
> + after 0 error foo
> +- after 10 [list ::set [namespace which -variable done] {}]
> ++ after 1000 [list ::set [namespace which -variable done] {}]
> + vwait [namespace which -variable done]
> + }
> + set result
> diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
> index 0d7c2e4ac3..57a86e4c64 100644
> --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
> +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
> @@ -22,6 +22,7 @@ SRC_URI = "${BASE_SRC_URI} \
> file://fix_issue_with_old_distro_glibc.patch \
> file://tcl-remove-hardcoded-install-path.patch \
> file://alter-includedir.patch \
> + file://interp.patch \
> file://run-ptest \
> "
> SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa"
> --
> 2.25.1
>
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-07-12 16:08 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-12 13:51 [PATCH 1/9] tcl: suffix all Tcl man pages instead of using alternatives Ross Burton
2021-07-12 13:51 ` [PATCH 2/9] tcl: EXTRA_OECONF already passes --libdir, don't do it again Ross Burton
2021-07-12 13:51 ` [PATCH 3/9] tcl: mark a patch as upstreamable Ross Burton
2021-07-12 13:51 ` [PATCH 4/9] tcl: use tcl-core instead of patching out packages Ross Burton
2021-07-12 13:51 ` [PATCH 5/9] tcl: use AUTOTOOLS_SCRIPT_PATH Ross Burton
2021-07-12 13:51 ` [PATCH 6/9] tcl: remove redundant file creation Ross Burton
2021-07-12 13:51 ` [PATCH 7/9] tcl: detect tests that error as well as fail Ross Burton
2021-07-12 13:51 ` [PATCH 8/9] tcl: clock.test needs a timezone to be set Ross Burton
2021-07-12 13:51 ` [PATCH 9/9] tcl: increase timeouts in interp.test Ross Burton
2021-07-12 16:08 ` [OE-core] " Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.