diff options
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/alter-includedir.patch')
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 86632d9144..bfc718cfd3 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -1,4 +1,9 @@ -Lets install the include header and private header files into +From 3130dca60636dc12d0d12df75b002fd123349e21 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 Upstream-Status: Inappropriate [Configuration Specific] @@ -7,20 +12,25 @@ 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 97b983b..dc2a4df 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -53,7 +53,7 @@ DLL_INSTALL_DIR = @DLL_INSTALL_DIR@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) +diff --git a/unix/Makefile.in b/unix/Makefile.in +index a3b7d69..969ddb8 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) + MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 # Directory in which to install the include file tcl.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -28,11 +38,11 @@ index 97b983b..dc2a4df 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -diff --git a/configure b/configure -index 3e78b49..24b3f92 100755 ---- a/configure -+++ b/configure -@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +diff --git a/unix/configure.in b/unix/configure.in +index 4974fb6..a72934f 100644 +--- a/unix/configure.in ++++ b/unix/configure.in +@@ -776,7 +776,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' @@ -41,7 +51,7 @@ index 3e78b49..24b3f92 100755 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -19293,7 +19293,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -897,7 +897,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir @@ -50,28 +60,16 @@ index 3e78b49..24b3f92 100755 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name -diff --git a/configure.in b/configure.in -index 0e28b14..62d9b41 100755 ---- a/configure.in -+++ b/configure.in -@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" - eval "TCL_LIB_FILE=${TCL_LIB_FILE}" - - test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' --PRIVATE_INCLUDE_DIR='$(includedir)' -+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' - HTML_DIR='$(DISTDIR)/html' - - # Note: in the following variable, it's important to use the absolute -@@ -912,7 +912,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" - TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" +diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in +index 93b5e69..dcd51d7 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@ + libfile=@TCL_LIB_FILE@ - # Install time header dir can be set via --includedir --eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" -+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" - - #------------------------------------------------------------------------ - # tclConfig.sh refers to this by a different name --- -1.7.10.4 - + Name: Tool Command Language |