Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...0001-tclCompCmdsSZ-cast-to-uintptr_t.patch | 28 +++++ recipes-devtools/tcltk/tcl-morello_8.6.11.bb | 104 ++++++++++++++++++ .../tcltk/tcl/alter-includedir.patch | 56 ++++++++++ .../tcl/fix_issue_with_old_distro_glibc.patch | 39 +++++++ .../tcl/fix_non_native_build_issue.patch | 64 +++++++++++ recipes-devtools/tcltk/tcl/interp.patch | 32 ++++++ recipes-devtools/tcltk/tcl/run-ptest | 17 +++ .../tcltk/tcl/tcl-add-soname.patch | 32 ++++++ .../tcl-remove-hardcoded-install-path.patch | 32 ++++++ 9 files changed, 404 insertions(+) create mode 100644 recipes-devtools/tcltk/cheri-patches/0001-tclCompCmdsSZ-cast-to-uintptr_t.patch create mode 100644 recipes-devtools/tcltk/tcl-morello_8.6.11.bb create mode 100644 recipes-devtools/tcltk/tcl/alter-includedir.patch create mode 100644 recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch create mode 100644 recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch create mode 100644 recipes-devtools/tcltk/tcl/interp.patch create mode 100644 recipes-devtools/tcltk/tcl/run-ptest create mode 100644 recipes-devtools/tcltk/tcl/tcl-add-soname.patch create mode 100644 recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
diff --git a/recipes-devtools/tcltk/cheri-patches/0001-tclCompCmdsSZ-cast-to-uintptr_t.patch b/recipes-devtools/tcltk/cheri-patches/0001-tclCompCmdsSZ-cast-to-uintptr_t.patch new file mode 100644 index 0000000..b781e60 --- /dev/null +++ b/recipes-devtools/tcltk/cheri-patches/0001-tclCompCmdsSZ-cast-to-uintptr_t.patch @@ -0,0 +1,28 @@ +From f184b339449f07e82a9c515a99e179fb7f602e8d Mon Sep 17 00:00:00 2001 +From: Pawel Zalewski pzalewski@thegoodpenguin.co.uk +Date: Tue, 16 Jan 2024 12:51:08 +0000 +Subject: [PATCH] tclCompCmdsSZ: cheri provenance + +Cast int values that are used in pointer arithmetic to uintptr_t. + +Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk +--- + generic/tclCompCmdsSZ.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c +index ddfe0dc..b48f2b6 100644 +--- a/generic/tclCompCmdsSZ.c ++++ b/generic/tclCompCmdsSZ.c +@@ -2383,7 +2383,7 @@ IssueSwitchJumpTable( + * point to here. + */ + +- Tcl_SetHashValue(hPtr, CurrentOffset(envPtr) - jumpLocation); ++ Tcl_SetHashValue(hPtr, CurrentOffset(envPtr) - (uintptr_t)jumpLocation); + } + Tcl_DStringFree(&buffer); + } else { +-- +2.34.1 + diff --git a/recipes-devtools/tcltk/tcl-morello_8.6.11.bb b/recipes-devtools/tcltk/tcl-morello_8.6.11.bb new file mode 100644 index 0000000..dfced55 --- /dev/null +++ b/recipes-devtools/tcltk/tcl-morello_8.6.11.bb @@ -0,0 +1,104 @@ +inherit autotools ptest binconfig purecap-sysroot + +MORELLO_SRC = "poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb" + +SUMMARY = "Tool Command Language - CHERI: sourced from poky/meta" +HOMEPAGE = "http://tcl.sourceforge.net" +DESCRIPTION = "Tool Command Language, is an open-source multi-purpose C library which includes a powerful dynamic scripting language. Together they provide ideal cross-platform development environment for any programming project." +SECTION = "devel/tcltk" + + +FILESEXTRAPATHS:prepend := "${THISDIR}/tcl:${THISDIR}/cheri-patches:" + +TOOLCHAIN = "${MORELLO_TOOLCHAIN}" + +# 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-morello" + +PVTCL = "8.6.11" +BPNTCL = "tcl" + +BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PVTCL}-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://tcl-remove-hardcoded-install-path.patch \ + file://alter-includedir.patch \ + file://interp.patch \ + file://run-ptest \ +" + +SRC_URI += "file://0001-tclCompCmdsSZ-cast-to-uintptr_t.patch" + +SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa" + +SRC_URI:class-native = "${BASE_SRC_URI}" + +# Upstream don't believe this is an exploitable issue +# https://core.tcl-lang.org/tcl/info/7079e4f91601e9c7 +CVE_CHECK_IGNORE += "CVE-2021-35331" + +UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(.\d+)+)-src" + +S = "${WORKDIR}/${BPNTCL}${PVTCL}" + +VER = "${PVTCL}" + +AUTOTOOLS_SCRIPT_PATH = "${S}/unix" +EXTRA_OECONF = "--enable-threads --enable-man-suffix" + +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}/${BPNTCL}${VER}/$dir + install -m 0644 ${S}/$dir/*.h ${D}${includedir}/${BPNTCL}${VER}/$dir/ + done +} + +SYSROOT_DIRS += "${bindir_crossscripts}" + +PACKAGES =+ "tcl-lib-morello" +FILES:tcl-lib-morello = "${libdir}/libtcl8.6.so.*" +FILES:${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" +FILES:${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" + +# isn't getting picked up by shlibs code +RDEPENDS:${PN} += "tcl-lib-morello" + +# 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/recipes-devtools/tcltk/tcl/alter-includedir.patch b/recipes-devtools/tcltk/tcl/alter-includedir.patch new file mode 100644 index 0000000..5b25af2 --- /dev/null +++ b/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -0,0 +1,56 @@ +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] + +Signed-off-by: Khem Raj raj.khem@gmai.com + +Fixed the TCL_INCLUDE_SPEC + +Signed-off-by: Robert Yang liezhi.yang@windriver.com +Signed-off-by: Yi Zhao yi.zhao@windriver.com + +--- + Makefile.in | 2 +- + configure | 4 ++-- + configure.in | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 0370491..daa569a 100644 +--- 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 + + # Directory in which to install the include file tcl.h: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION) + + # Path to the private tcl header dir: + PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ +diff --git a/configure.in b/configure.in +index 9f96e2b..e323e02 100644 +--- 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}" + + 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 +@@ -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 +-eval "TCL_INCLUDE_SPEC="-I${includedir}"" ++eval "TCL_INCLUDE_SPEC="-I${includedir}/tcl${VERSION}"" + + #------------------------------------------------------------------------ + # tclConfig.sh refers to this by a different name +-- +2.25.1 + diff --git a/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch new file mode 100644 index 0000000..2c31cec --- /dev/null +++ b/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch @@ -0,0 +1,39 @@ +Upstream-Status: Inappropriate [embedded specific] + +Fixes tcl target recipe build on old distros which have glibc older than 2.14 + +| + echo 'NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install' +| NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| + make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib +| Installing message catalogs +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man +| tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so) +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin +| make: *** [install-msgs] Error 1 + +Signed-off-by: Nitin A Kamble nitin.a.kamble@intel.com +2012/04/26 + +Index: unix/Makefile.in +=================================================================== +--- 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 + # library. +-SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ ++SHELL_ENV = @LD_LIBRARY_PATH_VAR@=${@LD_LIBRARY_PATH_VAR@} \ + TCLLIBPATH="@abs_builddir@/pkgs" \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" + +@@ -712,7 +712,7 @@ + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) + + gdb-test: ${TCLTEST_EXE} +- @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run ++ @echo "set env @LD_LIBRARY_PATH_VAR@=$${@LD_LIBRARY_PATH_VAR@}" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run + $(GDB) ${TCLTEST_EXE} --command=gdb.run diff --git a/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch new file mode 100644 index 0000000..5a10c93 --- /dev/null +++ b/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -0,0 +1,64 @@ +Upstream-Status: Inappropriate [upstream does not support installed tests] + +Index: unix/Makefile.in +=================================================================== +--- 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 + + test-tcl: ${TCLTEST_EXE} +- $(SHELL_ENV) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) ++ $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) + + gdb-test: ${TCLTEST_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 + @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run +- $(GDB) ./${TCLTEST_EXE} --command=gdb.run ++ $(GDB) ${TCLTEST_EXE} --command=gdb.run + rm gdb.run + + # Useful target to launch a built tcltest with the proper path,... + runtest: ${TCLTEST_EXE} +- $(SHELL_ENV) ./${TCLTEST_EXE} ++ $(SHELL_ENV) ${TCLTEST_EXE} + + # Useful target for running the test suite with an unwritable current + # directory... + ro-test: ${TCLTEST_EXE} +- echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE} ++ echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ${TCLTEST_EXE} + + # The following target generates the shared libraries in dltest/ that are used + # for testing; they are included as part of the "tcltest" target (via the +@@ -743,23 +743,23 @@ + # This target can be used to run tclsh from the build directory + # via `make shell SCRIPT=/tmp/foo.tcl` + shell: ${TCL_EXE} +- $(SHELL_ENV) ./${TCL_EXE} $(SCRIPT) ++ $(SHELL_ENV) ${TCL_EXE} $(SCRIPT) + + # This target can be used to run tclsh inside either gdb or insight + gdb: ${TCL_EXE} +- $(SHELL_ENV) $(GDB) ./${TCL_EXE} ++ $(SHELL_ENV) $(GDB) ${TCL_EXE} + + valgrind: ${TCL_EXE} ${TCLTEST_EXE} +- $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) ++ $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) + + valgrindshell: ${TCL_EXE} +- $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) ++ $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) + + trace-shell: ${TCL_EXE} +- $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCL_EXE} $(SCRIPT) ++ $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCL_EXE} $(SCRIPT) + + trace-test: ${TCLTEST_EXE} +- $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) ++ $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) + + #-------------------------------------------------------------------------- + # Installation rules diff --git a/recipes-devtools/tcltk/tcl/interp.patch b/recipes-devtools/tcltk/tcl/interp.patch new file mode 100644 index 0000000..95d6318 --- /dev/null +++ b/recipes-devtools/tcltk/tcl/interp.patch @@ -0,0 +1,32 @@ +The interp-36.7 patch has race conditions and is missing cleanup. This patch by +a Tcl maintainer should improve matters. + +Upstream-Status: Pending +Signed-off-by: Ross Burton ross.burton@arm.com + +diff --git a/tests/interp.test b/tests/interp.test +index d7424847f..fc90990f3 100644 +--- a/tests/interp.test ++++ b/tests/interp.test +@@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { + variable result + set result [lindex $args 0] + } ++ set tout [after 5000 {set result timeout}] + } -body { + child eval { + variable done {} + after 0 error foo +- after 10 [list ::set [namespace which -variable done] {}] +- vwait [namespace which -variable done] + } ++ vwait result + set result + } -cleanup { ++ after cancel $tout + variable result {} +- unset -nocomplain result ++ unset -nocomplain result tout + interp delete child + } -result foo + diff --git a/recipes-devtools/tcltk/tcl/run-ptest b/recipes-devtools/tcltk/tcl/run-ptest new file mode 100644 index 0000000..a62b703 --- /dev/null +++ b/recipes-devtools/tcltk/tcl/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# clock.test needs a timezone to be set +export TZ="Europe/London" +export TCL_LIBRARY=library + +for i in `ls tests/*.test | awk -F/ '{print $2}'`; do + ./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" + cat $i.log + else + echo "PASS: $i" + fi + rm -f $i.log +done diff --git a/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/recipes-devtools/tcltk/tcl/tcl-add-soname.patch new file mode 100644 index 0000000..c4283c4 --- /dev/null +++ b/recipes-devtools/tcltk/tcl/tcl-add-soname.patch @@ -0,0 +1,32 @@ +Upstream-Status: Pending + +Index: unix/tcl.m4 +=================================================================== +--- 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" + ++ # 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/Makefile.in +=================================================================== +--- 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)/" + @@INSTALL_LIB@ +- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" ++ mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ++ ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) ++ ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./ ++ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 + @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" + @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" + @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" diff --git a/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch new file mode 100644 index 0000000..99c5faf --- /dev/null +++ b/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch @@ -0,0 +1,32 @@ +From 6efc98774681795712073c2b91e5e9d1763239b8 Mon Sep 17 00:00:00 2001 +From: "Song.Li" Song.Li@windriver.com +Date: Wed, 1 Aug 2012 19:05:51 +0800 +Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target + +Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}. + +[YOCTO #2876] + +Upstream-Status: Pending + +Signed-off-by: Song.Li Song.Li@windriver.com +Signed-off-by: Kai Kang kai.kang@windriver.com +Signed-off-by: Yi Zhao yi.zhao@windriver.com +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: unix/configure.in +=================================================================== +--- 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}" + +-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' +