Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / refs/heads/master / . / poky / meta / recipes-devtools / tcltk / tcl / alter-includedir.patch
blob: bfc718cfd3c0358f60a0bf3fac4ab89a48e72a53 [file] [log] [blame]
Patrick Williams44b3caf2024-04-12 16:51:14 -0500[diff] [blame]1From 3130dca60636dc12d0d12df75b002fd123349e21 Mon Sep 17 00:00:00 2001
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]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>
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]22---
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]23 unix/Makefile.in | 2 +-
24 unix/configure.in | 4 ++--
25 unix/tcl.pc.in | 2 +-
26 3 files changed, 4 insertions(+), 4 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]27
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]28diff --git a/unix/Makefile.in b/unix/Makefile.in
Patrick Williams44b3caf2024-04-12 16:51:14 -0500[diff] [blame]29index a3b7d69..969ddb8 100644
Andrew Geissler5f350902021-07-23 13:09:54 -0400[diff] [blame]30--- a/unix/Makefile.in
31+++ b/unix/Makefile.in
Andrew Geisslerd1e89492021-02-12 15:35:20 -0600[diff] [blame]32@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
33 MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]34
35 # Directory in which to install the include file tcl.h:
36-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
37+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
38
39 # Path to the private tcl header dir:
40 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]41diff --git a/unix/configure.in b/unix/configure.in
Patrick Williams44b3caf2024-04-12 16:51:14 -0500[diff] [blame]42index 4974fb6..a72934f 100644
Andrew Geissler5f350902021-07-23 13:09:54 -0400[diff] [blame]43--- a/unix/configure.in
44+++ b/unix/configure.in
Patrick Williams44b3caf2024-04-12 16:51:14 -0500[diff] [blame]45@@ -776,7 +776,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]46 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
47
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]48 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]49-PRIVATE_INCLUDE_DIR='$(includedir)'
50+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
51 HTML_DIR='$(DISTDIR)/html'
52
53 # Note: in the following variable, it's important to use the absolute
Patrick Williams44b3caf2024-04-12 16:51:14 -0500[diff] [blame]54@@ -897,7 +897,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]55 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
56
57 # Install time header dir can be set via --includedir
58-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
59+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
60
61 #------------------------------------------------------------------------
62 # tclConfig.sh refers to this by a different name
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]63diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
64index 93b5e69..dcd51d7 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 libfile=@TCL_LIB_FILE@
74
75 Name: Tool Command Language