diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-12-05 08:26:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 16:48:21 +0000 |
commit | 66f28a9837fa92e22ad9f84fa54644c30088c3b3 (patch) | |
tree | e73656730fc48f0a10198f2d3a9d84b0b0a0fa41 /meta | |
parent | 5301c59503e0d3fdc0080d80754ec66db40de46c (diff) | |
download | poky-66f28a9837fa92e22ad9f84fa54644c30088c3b3.tar.gz |
tcl: fix tclConfig.sh to point to the correct private headers
When building expect with rm_work enabled, it was not finding the correct private
header files because they were removed from the WORKDIR, this fixes the tclConfig.sh
to point to the sysroot private area instead.
This also fixes the -L directory to point to STAGING_LIBDIR instead if INCDIR!
[YOCTO #5620]
(From OE-Core rev: 300760193c6bcfd20f1d4908f912bebd53e86281)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb index 10186c43d6..0d6468a38c 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb | |||
@@ -48,11 +48,13 @@ do_compile_prepend() { | |||
48 | do_install() { | 48 | do_install() { |
49 | autotools_do_install install-private-headers | 49 | autotools_do_install install-private-headers |
50 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh | 50 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh |
51 | sed -i "s+-L${B}+-L${STAGING_LIBDIR}+g" tclConfig.sh | ||
51 | sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh | 52 | sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh |
52 | sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh | 53 | sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh |
53 | sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh | 54 | sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh |
54 | install -d ${D}${bindir_crossscripts} | 55 | install -d ${D}${bindir_crossscripts} |
55 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} | 56 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} |
57 | install -m 0755 tclConfig.sh ${D}${libdir} | ||
56 | cd .. | 58 | cd .. |
57 | for dir in compat generic unix | 59 | for dir in compat generic unix |
58 | do | 60 | do |