summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/tcltk
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-01-17 17:16:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-19 16:32:10 +0000
commit13c016e01353f36fae208e20eb979a623ad009eb (patch)
tree3341c480a465f5502a6ff392e8d16e80cbc42e24 /meta/recipes-devtools/tcltk
parent6644dac5d115dbb240de39b8079a4357a47e79dd (diff)
downloadpoky-13c016e01353f36fae208e20eb979a623ad009eb.tar.gz
tcl: fix the TCL_INCLUDE_SPEC
We have moved the header files to ${includedir}/tcl${VERSION}, but we didn't fix the TCL_INCLUDE_SPEC which is still ${includedir}, it should also be ${includedir}/tcl${VERSION} Note: this commit modifiey alter-includedir.patch, so it doesn't look very clear, I only fixed one line in both configure and configure.in: -eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" +eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" The other changes are because I use git to create the patch while the previous one uses svn. [YOCTO #5732] (From OE-Core rev: a263281d9c774a03cce76caa3cc477cc85a9c2a9) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/tcltk')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/alter-includedir.patch60
1 files changed, 45 insertions, 15 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
index f543910be9..c8530e1f58 100644
--- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -5,11 +5,20 @@ Upstream-Status: Inappropriate [Configuration Specific]
5 5
6Signed-off-by: Khem Raj <raj.khem@gmai.com> 6Signed-off-by: Khem Raj <raj.khem@gmai.com>
7 7
8Index: unix/Makefile.in 8Fixed the TCL_INCLUDE_SPEC
9=================================================================== 9
10--- unix.orig/Makefile.in 2013-11-11 01:00:36.431550403 -0800 10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11+++ unix/Makefile.in 2013-11-11 01:05:09.587557282 -0800 11---
12@@ -53,7 +53,7 @@ 12 Makefile.in | 2 +-
13 configure | 4 ++--
14 configure.in | 4 ++--
15 3 files changed, 5 insertions(+), 5 deletions(-)
16
17diff --git a/Makefile.in b/Makefile.in
18index 97b983b..dc2a4df 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -53,7 +53,7 @@ DLL_INSTALL_DIR = @DLL_INSTALL_DIR@
13 SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) 22 SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
14 23
15 # Directory in which to install the include file tcl.h: 24 # Directory in which to install the include file tcl.h:
@@ -18,11 +27,11 @@ Index: unix/Makefile.in
18 27
19 # Path to the private tcl header dir: 28 # Path to the private tcl header dir:
20 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ 29 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
21Index: unix/configure.in 30diff --git a/configure b/configure
22=================================================================== 31index 3e78b49..24b3f92 100755
23--- unix.orig/configure.in 2013-11-11 01:00:36.467550403 -0800 32--- a/configure
24+++ unix/configure.in 2013-11-11 01:00:36.503550404 -0800 33+++ b/configure
25@@ -791,7 +791,7 @@ 34@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
26 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 35 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
27 36
28 TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 37 TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -31,11 +40,20 @@ Index: unix/configure.in
31 HTML_DIR='$(DISTDIR)/html' 40 HTML_DIR='$(DISTDIR)/html'
32 41
33 # Note: in the following variable, it's important to use the absolute 42 # Note: in the following variable, it's important to use the absolute
34Index: unix/configure 43@@ -19293,7 +19293,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
35=================================================================== 44 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
36--- unix.orig/configure 2013-11-11 01:00:36.467550403 -0800 45
37+++ unix/configure 2013-11-11 01:00:36.503550404 -0800 46 # Install time header dir can be set via --includedir
38@@ -19134,7 +19134,7 @@ 47-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
48+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
49
50 #------------------------------------------------------------------------
51 # tclConfig.sh refers to this by a different name
52diff --git a/configure.in b/configure.in
53index 0e28b14..62d9b41 100755
54--- a/configure.in
55+++ b/configure.in
56@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
39 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 57 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
40 58
41 TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 59 TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -44,3 +62,15 @@ Index: unix/configure
44 HTML_DIR='$(DISTDIR)/html' 62 HTML_DIR='$(DISTDIR)/html'
45 63
46 # Note: in the following variable, it's important to use the absolute 64 # Note: in the following variable, it's important to use the absolute
65@@ -912,7 +912,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
66 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
67
68 # Install time header dir can be set via --includedir
69-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
70+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
71
72 #------------------------------------------------------------------------
73 # tclConfig.sh refers to this by a different name
74--
751.7.10.4
76