diff options
author | Jiaying Song <jiaying.song.cn@windriver.com> | 2024-12-24 10:52:21 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-12-28 10:57:00 +0000 |
commit | 63068d0e340d4b01ab42ff9148af718fc8467cb2 (patch) | |
tree | dd79a8571b7f710d1a43e44c3eebf8d6eebe4535 | |
parent | 4ae3f0e0cddcd3c743090f17c6e95a8ad021307c (diff) | |
download | poky-63068d0e340d4b01ab42ff9148af718fc8467cb2.tar.gz |
tcl: Resolve tcl-ptest run failure
Modify the TCL_LIBRARY to the correct value to resolve the following errors caused by multilib:
application-specific initialization failed: Cannot find a usable init.tcl in the following directories:
/usr/lib/tcl/ptest/library {} /usr/lib64/tcl9.0 /usr/lib64/tcl/lib/tcl9.0 /usr/lib64/lib/tcl9.0 /usr/lib64/tcl/library /usr/lib64/library /usr/lib64/tcl9.0/library /usr/lib64/tcl9.0.0/library /usr/tcl9.0.0/library
(From OE-Core rev: 9ae194e7270b84876a51e21941cdd718e15f1e59)
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_9.0.0.bb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index 8a9f611b0f..be067f13ea 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | export TCL_LIBRARY=/usr/lib/tcl/ptest/library | 3 | export TCL_LIBRARY=@libdir@/tcl/ptest/library |
4 | export ERROR_ON_FAILURES=1 | 4 | export ERROR_ON_FAILURES=1 |
5 | export LANG=en-US.UTF-8 | 5 | export LANG=en-US.UTF-8 |
6 | 6 | ||
diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb b/meta/recipes-devtools/tcltk/tcl_9.0.0.bb index b67847c526..0d2efa44aa 100644 --- a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb +++ b/meta/recipes-devtools/tcltk/tcl_9.0.0.bb | |||
@@ -82,6 +82,8 @@ do_install_ptest() { | |||
82 | cp ${B}/tcltest ${D}${PTEST_PATH} | 82 | cp ${B}/tcltest ${D}${PTEST_PATH} |
83 | cp -r ${S}/library ${D}${PTEST_PATH} | 83 | cp -r ${S}/library ${D}${PTEST_PATH} |
84 | cp -r ${S}/tests ${D}${PTEST_PATH} | 84 | cp -r ${S}/tests ${D}${PTEST_PATH} |
85 | # handle multilib | ||
86 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest | ||
85 | } | 87 | } |
86 | 88 | ||
87 | do_install_ptest:append:libc-musl () { | 89 | do_install_ptest:append:libc-musl () { |