Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 517393d903089f921915530ffa689a7a1d113420 / . / poky / meta / recipes-devtools / tcltk / tcl / alter-includedir.patch
blob: 96d0ab2ad48c7bf7e9bb2609aca6227ca6f6911c [file] [log] [blame]
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]1From 27e5595c065ce3af687818555a882ab5e1dfbc2b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 22 Nov 2022 18:48:27 +0800
4Subject: [PATCH] tcl: update the header location
5
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]6Lets install the include header and private header files into
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]7usr/include/tcl8.6 when version of tcl is 8.6.x
8
9Upstream-Status: Inappropriate [Configuration Specific]
10
11Signed-off-by: Khem Raj <raj.khem@gmai.com>
12
13Fixed the TCL_INCLUDE_SPEC
14
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]15Also update the header location in tcl.pc to correct the header
16location in case some package such python3 which use pkg-config
17to detect tcl doesn't find the header.
18
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]20Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]21Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]22
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]23---
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]24 unix/Makefile.in | 2 +-
25 unix/configure.in | 4 ++--
26 unix/tcl.pc.in | 2 +-
27 3 files changed, 4 insertions(+), 4 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]28
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]29diff --git a/unix/Makefile.in b/unix/Makefile.in
30index 0b8179f..4824b28 100644
Andrew Geissler5f350902021-07-23 13:09:54 -0400[diff] [blame]31--- a/unix/Makefile.in
32+++ b/unix/Makefile.in
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]33@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
34 MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]35
36 # Directory in which to install the include file tcl.h:
37-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
38+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
39
40 # Path to the private tcl header dir:
41 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]42diff --git a/unix/configure.in b/unix/configure.in
43index 0354a0b..2d0c00f 100644
Andrew Geissler5f350902021-07-23 13:09:54 -0400[diff] [blame]44--- a/unix/configure.in
45+++ b/unix/configure.in
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]46@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]47 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
48
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]49 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]50-PRIVATE_INCLUDE_DIR='$(includedir)'
51+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
52 HTML_DIR='$(DISTDIR)/html'
53
54 # Note: in the following variable, it's important to use the absolute
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]55@@ -895,7 +895,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]56 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
57
58 # Install time header dir can be set via --includedir
59-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
60+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
61
62 #------------------------------------------------------------------------
63 # tclConfig.sh refers to this by a different name
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]64diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
65index 93b5e69..dcd51d7 100644
66--- a/unix/tcl.pc.in
67+++ b/unix/tcl.pc.in
68@@ -3,7 +3,7 @@
69 prefix=@prefix@
70 exec_prefix=@exec_prefix@
71 libdir=@libdir@
72-includedir=@includedir@
73+includedir=@includedir@/tcl@PACKAGE_VERSION@
74 libfile=@TCL_LIB_FILE@
75
76 Name: Tool Command Language