diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/tcltk')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch | 2 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch | 20 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.6.bb (renamed from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.4.bb) | 11 |
3 files changed, 14 insertions, 19 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch index 5b5de0730..72a0fa452 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch +++ b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch @@ -12,7 +12,7 @@ Fixes tcl target recipe build on old distros which have glibc older than 2.14 | 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> +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2012/04/26 Index: unix/Makefile.in diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch index ab6cc4316..5c622a236 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch +++ b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch @@ -5,26 +5,26 @@ Upstream-Status:Inappropriate [embedded specific] Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> -Index: unix/Makefile.in -=================================================================== ---- unix.orig/Makefile.in 2013-11-10 23:38:12.235425891 -0800 -+++ unix/Makefile.in 2013-11-10 23:38:12.231425891 -0800 -@@ -611,7 +611,7 @@ +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} $(STUB_LIB_FILE) ${TCL_EXE} + binaries: ${LIB_FILE} ${TCL_EXE} -@@ -653,12 +653,12 @@ +@@ -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 -f *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \ + 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 @@ -33,7 +33,7 @@ Index: unix/Makefile.in rm -rf Makefile config.status config.cache config.log tclConfig.sh \ tclConfig.h *.plist Tcl.framework tcl.pc cd dltest ; $(MAKE) distclean -@@ -706,7 +706,7 @@ +@@ -709,7 +709,7 @@ tcltest-real: # tcltest, ie: # % make test TESTFLAGS="-verbose bps -file fileName.test" @@ -42,7 +42,7 @@ Index: unix/Makefile.in test-tcl: ${TCLTEST_EXE} $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -@@ -771,7 +771,7 @@ +@@ -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) \ diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.4.bb b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.6.bb index 8e92b3e24..2dd0a7ae9 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.4.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.6.bb @@ -24,8 +24,8 @@ SRC_URI = "${BASE_SRC_URI} \ file://alter-includedir.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "d7cbb91f1ded1919370a30edd1534304" -SRC_URI[sha256sum] = "9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d" +SRC_URI[md5sum] = "5193aea8107839a79df8ac709552ecb7" +SRC_URI[sha256sum] = "a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07" SRC_URI_class-native = "${BASE_SRC_URI}" @@ -56,8 +56,6 @@ do_install() { 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 - sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh - sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh install -d ${D}${bindir_crossscripts} install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} install -m 0755 tclConfig.sh ${D}${libdir} @@ -68,10 +66,7 @@ do_install() { done } -SYSROOT_PREPROCESS_FUNCS += "tcl_sysroot_preprocess" -tcl_sysroot_preprocess () { - sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} -} +SYSROOT_DIRS += "${bindir_crossscripts}" PACKAGES =+ "tcl-lib" FILES_tcl-lib = "${libdir}/libtcl8.6.so.*" |
