mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

tcl: correct the header location in tcl.pc

Browse Source 
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>
This commit is contained in:
Mingli Yu
2022-11-22 21:38:01 +08:00
committed by Richard Purdie
parent 5fdd28e37f
commit 44a65473a1
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+30 -8
View File
@@ -1,3 +1,8 @@
From c6960f4ca82a153416d138221dd2426475aed683 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
Date: Tue, 22 Nov 2022 18:48:27 +0800
Subject: [PATCH] tcl: update the header location
Lets install the include header and private header files into
usr/include/tcl8.6 when version of tcl is 8.6.x
@@ -7,17 +12,21 @@ Signed-off-by: Khem Raj <raj.khem@gmai.com>
Fixed the TCL_INCLUDE_SPEC
Also update the header location in tcl.pc to correct the header
location in case some package such python3 which use pkg-config
to detect tcl doesn't find the header.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
Makefile.in | 2 +-
configure | 4 ++--
configure.in | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
unix/Makefile.in | 2 +-
unix/configure.in | 4 ++--
unix/tcl.pc.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0370491..daa569a 100644
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0ebac43..b0c3ee0 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -29,7 +38,7 @@ index 0370491..daa569a 100644
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
diff --git a/configure.in b/configure.in
diff --git a/unix/configure.in b/unix/configure.in
index 9f96e2b..e323e02 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -51,6 +60,19 @@ index 9f96e2b..e323e02 100644
#------------------------------------------------------------------------
# tclConfig.sh refers to this by a different name
diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
index 846cb11..72ca44b 100644
--- a/unix/tcl.pc.in
+++ b/unix/tcl.pc.in
@@ -3,7 +3,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/tcl@PACKAGE_VERSION@
Name: Tool Command Language
Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
--
2.25.1