]> code.ossystems Code Review - openembedded-core.git/commitdiff
tcl: Fix dangerous do_install staging references
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 27 Sep 2012 22:05:27 +0000 (23:05 +0100)
committerSaul Wold <sgw@linux.intel.com>
Fri, 28 Sep 2012 08:14:30 +0000 (01:14 -0700)
Nothing should ever be poking files directly into the staging/sysroot
directories, it should always go through ${D}.

This patch ensures this recipe does this and hence fixes various
potential build issues such as lack of sstate tracking of files.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-devtools/tcltk/tcl_8.5.11.bb

index e5fe7d35c0b3a465356b1cc948f88a8695dd486e..fab6057d664463e154b12a61834434b1bb121746 100644 (file)
@@ -44,7 +44,7 @@ do_compile_prepend() {
 
 do_install() {
        autotools_do_install
-       oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR}
+       oe_libinstall -so libtcl8.5 ${D}${libdir}
        ln -sf ./tclsh8.5 ${D}${bindir}/tclsh
        sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
        sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
@@ -54,8 +54,8 @@ do_install() {
        cd ..
        for dir in compat generic unix
        do
-               install -d ${STAGING_INCDIR}/tcl${PV}/$dir
-               install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/
+               install -d ${D}${includedir}/tcl${PV}/$dir
+               install -m 0644 $dir/*.h ${D}${includedir}/tcl${PV}/$dir/
        done
 }