Gitiles
Code Review Sign In
gerrit.openbmc.org / stefanberger / openbmc / 6694f726c484daa08417dab3a698839fcde9c1eb / . / poky / meta / recipes-devtools / tcltk / tcl / alter-includedir.patch
blob: 66c395d4013d7ac72cde73b5c4b3157f8f765d8d [file] [log] [blame]
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]1Lets install the include header and private header files into
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]2usr/include/tcl8.6 when version of tcl is 8.6.x
3
4Upstream-Status: Inappropriate [Configuration Specific]
5
6Signed-off-by: Khem Raj <raj.khem@gmai.com>
7
8Fixed the TCL_INCLUDE_SPEC
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]12
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]13---
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]14 Makefile.in | 2 +-
15 configure | 4 ++--
16 configure.in | 4 ++--
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]17 3 files changed, 5 insertions(+), 5 deletions(-)
18
19diff --git a/Makefile.in b/Makefile.in
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]20index 0370491..daa569a 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]21--- a/Makefile.in
22+++ b/Makefile.in
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]23@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
24 MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]25
26 # Directory in which to install the include file tcl.h:
27-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
28+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
29
30 # Path to the private tcl header dir:
31 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
32diff --git a/configure b/configure
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]33index 181b9b3..f4cc225 100755
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]34--- a/configure
35+++ b/configure
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]36@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]37 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
38
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]39 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]40-PRIVATE_INCLUDE_DIR='$(includedir)'
41+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
42 HTML_DIR='$(DISTDIR)/html'
43
44 # Note: in the following variable, it's important to use the absolute
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]45@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]46 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
47
48 # Install time header dir can be set via --includedir
49-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
50+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
51
52 #------------------------------------------------------------------------
53 # tclConfig.sh refers to this by a different name
54diff --git a/configure.in b/configure.in
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]55index 9f96e2b..e323e02 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]56--- a/configure.in
57+++ b/configure.in
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]58@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]59 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
60
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]61 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]62-PRIVATE_INCLUDE_DIR='$(includedir)'
63+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
64 HTML_DIR='$(DISTDIR)/html'
65
66 # Note: in the following variable, it's important to use the absolute
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]67@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]68 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
69
70 # Install time header dir can be set via --includedir
71-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
72+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
73
74 #------------------------------------------------------------------------
75 # tclConfig.sh refers to this by a different name
76--
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]772.25.1
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]78