summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/alter-includedir.patch')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/alter-includedir.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
index 26c9b0d7fa..96d0ab2ad4 100644
--- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -1,4 +1,4 @@
1From c6960f4ca82a153416d138221dd2426475aed683 Mon Sep 17 00:00:00 2001 1From 27e5595c065ce3af687818555a882ab5e1dfbc2b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 22 Nov 2022 18:48:27 +0800 3Date: Tue, 22 Nov 2022 18:48:27 +0800
4Subject: [PATCH] tcl: update the header location 4Subject: [PATCH] tcl: update the header location
@@ -19,6 +19,7 @@ to detect tcl doesn't find the header.
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 20Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
21Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 21Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
22
22--- 23---
23 unix/Makefile.in | 2 +- 24 unix/Makefile.in | 2 +-
24 unix/configure.in | 4 ++-- 25 unix/configure.in | 4 ++--
@@ -26,7 +27,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
26 3 files changed, 4 insertions(+), 4 deletions(-) 27 3 files changed, 4 insertions(+), 4 deletions(-)
27 28
28diff --git a/unix/Makefile.in b/unix/Makefile.in 29diff --git a/unix/Makefile.in b/unix/Makefile.in
29index 0ebac43..b0c3ee0 100644 30index 0b8179f..4824b28 100644
30--- a/unix/Makefile.in 31--- a/unix/Makefile.in
31+++ b/unix/Makefile.in 32+++ b/unix/Makefile.in
32@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) 33@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -39,10 +40,10 @@ index 0ebac43..b0c3ee0 100644
39 # Path to the private tcl header dir: 40 # Path to the private tcl header dir:
40 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ 41 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
41diff --git a/unix/configure.in b/unix/configure.in 42diff --git a/unix/configure.in b/unix/configure.in
42index 9f96e2b..e323e02 100644 43index 0354a0b..2d0c00f 100644
43--- a/unix/configure.in 44--- a/unix/configure.in
44+++ b/unix/configure.in 45+++ b/unix/configure.in
45@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 46@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
46 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 47 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
47 48
48 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 49 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -51,7 +52,7 @@ index 9f96e2b..e323e02 100644
51 HTML_DIR='$(DISTDIR)/html' 52 HTML_DIR='$(DISTDIR)/html'
52 53
53 # Note: in the following variable, it's important to use the absolute 54 # Note: in the following variable, it's important to use the absolute
54@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 55@@ -895,7 +895,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
55 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" 56 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
56 57
57 # Install time header dir can be set via --includedir 58 # Install time header dir can be set via --includedir
@@ -61,7 +62,7 @@ index 9f96e2b..e323e02 100644
61 #------------------------------------------------------------------------ 62 #------------------------------------------------------------------------
62 # tclConfig.sh refers to this by a different name 63 # tclConfig.sh refers to this by a different name
63diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in 64diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
64index 846cb11..72ca44b 100644 65index 93b5e69..dcd51d7 100644
65--- a/unix/tcl.pc.in 66--- a/unix/tcl.pc.in
66+++ b/unix/tcl.pc.in 67+++ b/unix/tcl.pc.in
67@@ -3,7 +3,7 @@ 68@@ -3,7 +3,7 @@
@@ -70,9 +71,6 @@ index 846cb11..72ca44b 100644
70 libdir=@libdir@ 71 libdir=@libdir@
71-includedir=@includedir@ 72-includedir=@includedir@
72+includedir=@includedir@/tcl@PACKAGE_VERSION@ 73+includedir=@includedir@/tcl@PACKAGE_VERSION@
74 libfile=@TCL_LIB_FILE@
73 75
74 Name: Tool Command Language 76 Name: Tool Command Language
75 Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
76--
772.25.1
78