tcl: Fix dangerous do_install staging references

PATCH New Richard Purdie 1 participant 1 message Sep 27, 2012

lore

Share & tools

lore

Richard Purdie

author

2012-09-27 22:18 UTC #0 lore raw

PATCH 1/1 tcl: Fix dangerous do_install staging references

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 <[email protected]>

---

meta/recipes-devtools/tcltk/tcl_8.5.11.bb +3 -3

index e5fe7d3..fab6057 100644
@@ -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
 }