diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-02-14 22:25:10 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-23 12:49:50 -0800 |
commit | 04ce3a37b6a4a53d020feb8ec2c21348aff6a81b (patch) | |
tree | d15085e510e240d773fc5f43084c8e954b35a274 /meta/recipes-devtools | |
parent | c5f7a5af370f9fe5f680640c611ec8fc4fdaecd5 (diff) | |
download | poky-04ce3a37b6a4a53d020feb8ec2c21348aff6a81b.tar.gz |
tcl: fix sed in do_install()
The command:
sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
was used for replacing "${WORKDIR}", but it also replaced
"-L${WORKDIR}", but binconfig.bbclass would replace "-L${WORKDIR}", too,
which caused incorrect result, use "'${WORKDIR}" to fix the problem.
(From OE-Core rev: 2edfcbf0291c0d39be4a37348696329eba8a41f8)
(From OE-Core rev: 68960cbdf12de8aaff0f792091f839c987cc0aa0)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.6.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.6.bb b/meta/recipes-devtools/tcltk/tcl_8.6.6.bb index c828b38772..40cd18fb09 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.6.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.6.bb | |||
@@ -55,7 +55,7 @@ do_install() { | |||
55 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh | 55 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh |
56 | ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} | 56 | ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} |
57 | sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh | 57 | sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh |
58 | sed -i "s;${WORKDIR};${STAGING_INCDIR};g" tclConfig.sh | 58 | sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tclConfig.sh |
59 | install -d ${D}${bindir_crossscripts} | 59 | install -d ${D}${bindir_crossscripts} |
60 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} | 60 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} |
61 | install -m 0755 tclConfig.sh ${D}${libdir} | 61 | install -m 0755 tclConfig.sh ${D}${libdir} |