1 files changed, 8 insertions, 16 deletions

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 9c295a66dd..71956f30b7 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
@@ -15,11 +15,11 @@ Fixes tcl target recipe build on old distros which have glibc older than 2.14
 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
 2012/04/26
 
-Index: unix/Makefile.in
-===================================================================
+diff --git unix.orig/Makefile.in unix/Makefile.in
+index c8ce872..06a6406 100644
 --- unix.orig/Makefile.in
 +++ unix/Makefile.in
-@@ -592,12 +592,12 @@ tcltest-real:
+@@ -594,12 +594,12 @@ tcltest-real:
  #      % make test TESTFLAGS="-verbose bps -file fileName.test"
  
  test: tcltest@EXEEXT@
@@ -34,7 +34,7 @@ Index: unix/Makefile.in
         @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@EXEEXT@ --command=gdb.run
-@@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@
+@@ -607,27 +607,27 @@ gdb-test: tcltest@EXEEXT@
  
  # Useful target to launch a built tcltest with the proper path,...
  runtest: tcltest@EXEEXT@
@@ -66,7 +66,7 @@ Index: unix/Makefile.in
         @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
         $(GDB) ${TCL_EXE} --command=gdb.run
         rm gdb.run
-@@ -633,12 +633,12 @@ gdb: ${TCL_EXE}
+@@ -635,12 +635,12 @@ gdb: ${TCL_EXE}
  VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
  
  valgrind: ${TCL_EXE} tcltest@EXEEXT@
@@ -81,24 +81,16 @@ Index: unix/Makefile.in
         TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
         valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT)
  
-@@ -802,14 +802,14 @@ install-libraries: libraries $(INSTALL_T
+@@ -795,7 +795,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
  
  install-tzdata: ${TCL_EXE}
-        @echo "Installing time zone data"
+        @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
 -       @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
 +       @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
         TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
         ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
             $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
- 
- install-msgs: ${TCL_EXE}
-        @echo "Installing message catalogs"
--       @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
-+       @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
-        TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
-        ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
-            $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
-@@ -1733,7 +1733,7 @@ html-tk: ${TCL_EXE}
+@@ -1729,7 +1729,7 @@ html-tk: ${TCL_EXE}
         @EXTRA_BUILD_HTML@
  
  BUILD_HTML = \