diff options
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index 9c2d379611..c5f6d8e70b 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | |||
@@ -1,10 +1,10 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | Index: unix/Makefile.in | 3 | diff --git unix.orig/Makefile.in unix/Makefile.in |
4 | =================================================================== | 4 | index 87deb20..c8ce872 100644 |
5 | --- unix.orig/Makefile.in | 5 | --- unix.orig/Makefile.in |
6 | +++ unix/Makefile.in | 6 | +++ unix/Makefile.in |
7 | @@ -619,13 +619,13 @@ ro-test: tcltest@EXEEXT@ | 7 | @@ -623,13 +623,13 @@ ro-test: tcltest@EXEEXT@ |
8 | shell: ${TCL_EXE} | 8 | shell: ${TCL_EXE} |
9 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 9 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ |
10 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 10 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ |
@@ -20,7 +20,7 @@ Index: unix/Makefile.in | |||
20 | rm gdb.run | 20 | rm gdb.run |
21 | 21 | ||
22 | VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v | 22 | VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v |
23 | @@ -638,7 +638,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@ | 23 | @@ -642,7 +642,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@ |
24 | valgrindshell: ${TCL_EXE} | 24 | valgrindshell: ${TCL_EXE} |
25 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 25 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ |
26 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 26 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ |
@@ -29,24 +29,16 @@ Index: unix/Makefile.in | |||
29 | 29 | ||
30 | # The following target outputs the name of the top-level source directory for | 30 | # The following target outputs the name of the top-level source directory for |
31 | # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL | 31 | # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL |
32 | @@ -802,14 +802,14 @@ install-tzdata: ${TCL_EXE} | 32 | @@ -797,7 +797,7 @@ install-tzdata: ${TCL_EXE} |
33 | @echo "Installing time zone data" | 33 | @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" |
34 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 34 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ |
35 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 35 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ |
36 | - ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | 36 | - ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ |
37 | + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | 37 | + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ |
38 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata | 38 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata |
39 | 39 | ||
40 | install-msgs: ${TCL_EXE} | 40 | install-msgs: |
41 | @echo "Installing message catalogs" | 41 | @@ -1731,7 +1731,7 @@ html-tk: ${TCL_EXE} |
42 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
43 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
44 | - ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | ||
45 | + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | ||
46 | $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs | ||
47 | |||
48 | install-doc: doc | ||
49 | @@ -1730,7 +1730,7 @@ html-tk: ${TCL_EXE} | ||
50 | BUILD_HTML = \ | 42 | BUILD_HTML = \ |
51 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 43 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ |
52 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 44 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ |