From 2429773613cb95b6a0541b5cce6ce1338d5cfc2b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 12 Jul 2011 00:20:04 -0700 Subject: gcc: Fix packaging correctly [YOCTO #1233] This fix directly packages the contents in and adds the lib*.so correctly to the -dev package. (From OE-Core rev: d3c5f93714165e5c089ce80194f2be07e31d920c) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-package-target.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/gcc/gcc-package-target.inc') diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc index 69abf723ba..9a91a7f39f 100644 --- a/meta/recipes-devtools/gcc/gcc-package-target.inc +++ b/meta/recipes-devtools/gcc/gcc-package-target.inc @@ -14,10 +14,12 @@ FILES_${PN} = "\ ${bindir}/${TARGET_PREFIX}gcc \ ${bindir}/${TARGET_PREFIX}gccbug \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ " @@ -26,6 +28,8 @@ FILES_${PN}-dbg += "\ " FILES_${PN}-dev = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ " FILES_${PN}-symlinks = "\ ${bindir}/cc \ @@ -80,7 +84,6 @@ do_install () { # Cleanup some of the ${libdir}{,exec}/gcc stuff ... rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.so rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la # Hack around specs file assumptions -- cgit v1.2.3-54-g00ecf