diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2022-11-22 21:38:01 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-22 22:39:45 +0000 |
commit | 44a65473a1a9394519ce143f74413bd7777ed657 (patch) | |
tree | 35f79ad194d8d118f00e21bb64e1256e77fd9784 | |
parent | 5fdd28e37face59410da781d5d70178565e69e5e (diff) | |
download | poky-44a65473a1a9394519ce143f74413bd7777ed657.tar.gz |
tcl: correct the header location in tcl.pc
The patch alter-includedir.patch previouly install the header
to /usr/include/tcl8.6, but it doesn't reflect in tcl.pc and
the header location still /usr/include in tcl.pc and result
in the below configure failure for other packages such as
python3 which depends on tcl and uses pkg-config to detect tcl.
| conftest.c:161:16: fatal error: tcl.h: No such file or directory
161 | #include <tcl.h>
So update alter-includedir.patch to correct the header location
in tcl.pc to keep consistency.
(From OE-Core rev: ff156411380640f99ddb058ed8da0626d3183954)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 5b25af2c0c..26c9b0d7fa 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From c6960f4ca82a153416d138221dd2426475aed683 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Tue, 22 Nov 2022 18:48:27 +0800 | ||
4 | Subject: [PATCH] tcl: update the header location | ||
5 | |||
1 | Lets install the include header and private header files into | 6 | Lets install the include header and private header files into |
2 | usr/include/tcl8.6 when version of tcl is 8.6.x | 7 | usr/include/tcl8.6 when version of tcl is 8.6.x |
3 | 8 | ||
@@ -7,17 +12,21 @@ Signed-off-by: Khem Raj <raj.khem@gmai.com> | |||
7 | 12 | ||
8 | Fixed the TCL_INCLUDE_SPEC | 13 | Fixed the TCL_INCLUDE_SPEC |
9 | 14 | ||
15 | Also update the header location in tcl.pc to correct the header | ||
16 | location in case some package such python3 which use pkg-config | ||
17 | to detect tcl doesn't find the header. | ||
18 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
12 | 21 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |
13 | --- | 22 | --- |
14 | Makefile.in | 2 +- | 23 | unix/Makefile.in | 2 +- |
15 | configure | 4 ++-- | 24 | unix/configure.in | 4 ++-- |
16 | configure.in | 4 ++-- | 25 | unix/tcl.pc.in | 2 +- |
17 | 3 files changed, 5 insertions(+), 5 deletions(-) | 26 | 3 files changed, 4 insertions(+), 4 deletions(-) |
18 | 27 | ||
19 | diff --git a/Makefile.in b/Makefile.in | 28 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
20 | index 0370491..daa569a 100644 | 29 | index 0ebac43..b0c3ee0 100644 |
21 | --- a/unix/Makefile.in | 30 | --- a/unix/Makefile.in |
22 | +++ b/unix/Makefile.in | 31 | +++ b/unix/Makefile.in |
23 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) | 32 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) |
@@ -29,7 +38,7 @@ index 0370491..daa569a 100644 | |||
29 | 38 | ||
30 | # Path to the private tcl header dir: | 39 | # Path to the private tcl header dir: |
31 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ | 40 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ |
32 | diff --git a/configure.in b/configure.in | 41 | diff --git a/unix/configure.in b/unix/configure.in |
33 | index 9f96e2b..e323e02 100644 | 42 | index 9f96e2b..e323e02 100644 |
34 | --- a/unix/configure.in | 43 | --- a/unix/configure.in |
35 | +++ b/unix/configure.in | 44 | +++ b/unix/configure.in |
@@ -51,6 +60,19 @@ index 9f96e2b..e323e02 100644 | |||
51 | 60 | ||
52 | #------------------------------------------------------------------------ | 61 | #------------------------------------------------------------------------ |
53 | # tclConfig.sh refers to this by a different name | 62 | # tclConfig.sh refers to this by a different name |
63 | diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in | ||
64 | index 846cb11..72ca44b 100644 | ||
65 | --- a/unix/tcl.pc.in | ||
66 | +++ b/unix/tcl.pc.in | ||
67 | @@ -3,7 +3,7 @@ | ||
68 | prefix=@prefix@ | ||
69 | exec_prefix=@exec_prefix@ | ||
70 | libdir=@libdir@ | ||
71 | -includedir=@includedir@ | ||
72 | +includedir=@includedir@/tcl@PACKAGE_VERSION@ | ||
73 | |||
74 | Name: Tool Command Language | ||
75 | Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses. | ||
54 | -- | 76 | -- |
55 | 2.25.1 | 77 | 2.25.1 |
56 | 78 | ||