diff options
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch | 24 |
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 | |||
15 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | 15 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> |
16 | 2012/04/26 | 16 | 2012/04/26 |
17 | 17 | ||
18 | Index: unix/Makefile.in | 18 | diff --git unix.orig/Makefile.in unix/Makefile.in |
19 | =================================================================== | 19 | index c8ce872..06a6406 100644 |
20 | --- unix.orig/Makefile.in | 20 | --- unix.orig/Makefile.in |
21 | +++ unix/Makefile.in | 21 | +++ unix/Makefile.in |
22 | @@ -592,12 +592,12 @@ tcltest-real: | 22 | @@ -594,12 +594,12 @@ tcltest-real: |
23 | # % make test TESTFLAGS="-verbose bps -file fileName.test" | 23 | # % make test TESTFLAGS="-verbose bps -file fileName.test" |
24 | 24 | ||
25 | test: tcltest@EXEEXT@ | 25 | test: tcltest@EXEEXT@ |
@@ -34,7 +34,7 @@ Index: unix/Makefile.in | |||
34 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | 34 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run |
35 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | 35 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run |
36 | $(GDB) ./tcltest@EXEEXT@ --command=gdb.run | 36 | $(GDB) ./tcltest@EXEEXT@ --command=gdb.run |
37 | @@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@ | 37 | @@ -607,27 +607,27 @@ gdb-test: tcltest@EXEEXT@ |
38 | 38 | ||
39 | # Useful target to launch a built tcltest with the proper path,... | 39 | # Useful target to launch a built tcltest with the proper path,... |
40 | runtest: tcltest@EXEEXT@ | 40 | runtest: tcltest@EXEEXT@ |
@@ -66,7 +66,7 @@ Index: unix/Makefile.in | |||
66 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | 66 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run |
67 | $(GDB) ${TCL_EXE} --command=gdb.run | 67 | $(GDB) ${TCL_EXE} --command=gdb.run |
68 | rm gdb.run | 68 | rm gdb.run |
69 | @@ -633,12 +633,12 @@ gdb: ${TCL_EXE} | 69 | @@ -635,12 +635,12 @@ gdb: ${TCL_EXE} |
70 | VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v | 70 | VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v |
71 | 71 | ||
72 | valgrind: ${TCL_EXE} tcltest@EXEEXT@ | 72 | valgrind: ${TCL_EXE} tcltest@EXEEXT@ |
@@ -81,24 +81,16 @@ Index: unix/Makefile.in | |||
81 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 81 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ |
82 | valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) | 82 | valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) |
83 | 83 | ||
84 | @@ -802,14 +802,14 @@ install-libraries: libraries $(INSTALL_T | 84 | @@ -795,7 +795,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs |
85 | 85 | ||
86 | install-tzdata: ${TCL_EXE} | 86 | install-tzdata: ${TCL_EXE} |
87 | @echo "Installing time zone data" | 87 | @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" |
88 | - @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 88 | - @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ |
89 | + @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 89 | + @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ |
90 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 90 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ |
91 | ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | 91 | ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ |
92 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata | 92 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata |
93 | 93 | @@ -1729,7 +1729,7 @@ html-tk: ${TCL_EXE} | |
94 | install-msgs: ${TCL_EXE} | ||
95 | @echo "Installing message catalogs" | ||
96 | - @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
97 | + @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
98 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
99 | ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | ||
100 | $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs | ||
101 | @@ -1733,7 +1733,7 @@ html-tk: ${TCL_EXE} | ||
102 | @EXTRA_BUILD_HTML@ | 94 | @EXTRA_BUILD_HTML@ |
103 | 95 | ||
104 | BUILD_HTML = \ | 96 | BUILD_HTML = \ |