summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-12 00:20:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 15:00:46 +0100
commit2429773613cb95b6a0541b5cce6ce1338d5cfc2b (patch)
tree90bdd5e07d3b8834488ff61de33243625621d94c
parentb36f998fc7b185e67d094fe59239f7a77167a9c4 (diff)
downloadpoky-2429773613cb95b6a0541b5cce6ce1338d5cfc2b.tar.gz
poky-2429773613cb95b6a0541b5cce6ce1338d5cfc2b.tar.bz2
poky-2429773613cb95b6a0541b5cce6ce1338d5cfc2b.zip
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 <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-target.inc9
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