diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-07-12 00:20:04 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-12 14:50:10 +0100 |
| commit | d3c5f93714165e5c089ce80194f2be07e31d920c (patch) | |
| tree | 113c58130e0c175d7910ae1682228a0682c1fac9 /meta/recipes-devtools/gcc | |
| parent | 7df4f5f3d64f1f60814cea60d83270be7bfa4f2c (diff) | |
| download | openembedded-core-d3c5f93714165e5c089ce80194f2be07e31d920c.tar.gz openembedded-core-d3c5f93714165e5c089ce80194f2be07e31d920c.tar.bz2 openembedded-core-d3c5f93714165e5c089ce80194f2be07e31d920c.zip | |
gcc: Fix packaging correctly
[YOCTO #1233]
This fix directly packages the contents in and adds the lib*.so
correctly to the -dev package.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-package-target.inc | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index a880111cbd..56064b5f8b 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r6" +PR = "r8" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 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 |