mirror of
https://git.yoctoproject.org/poky
synced 2026-04-24 12:32:11 +02:00
b8ce0c92e2
Refresh patches: alter-includedir.patch tcl-remove-hardcoded-install-path.patch Backport a patch to fix tk build failure with cross compile: 0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch See: https://core.tcl-lang.org/tk/tktview/abd4abedd2f01c12839f0ad94564ae31137f7af5 (From OE-Core rev: f7226d8b28d7ee9292c53c8830c86c0619910f23) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
78 lines
2.7 KiB
Diff
78 lines
2.7 KiB
Diff
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]
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmai.com>
|
|
|
|
Fixed the TCL_INCLUDE_SPEC
|
|
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
Makefile.in | 2 +-
|
|
configure | 4 ++--
|
|
configure.in | 4 ++--
|
|
3 files changed, 5 insertions(+), 5 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)
|
|
|
|
# Directory in which to install the include file tcl.h:
|
|
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
|
|
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
|
|
|
|
# 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}"
|
|
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
|
|
@@ -19293,7 +19293,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
|
|
-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
|
|
+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
|
|
|
|
#------------------------------------------------------------------------
|
|
# 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}"
|
|
|
|
# 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
|
|
|