[oe-commits] Saul Wold : gcc: Fix packaging correctly
git version control
git at git.openembedded.org
Tue Jul 12 14:00:22 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: d3c5f93714165e5c089ce80194f2be07e31d920c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d3c5f93714165e5c089ce80194f2be07e31d920c
Author: Saul Wold <sgw at linux.intel.com>
Date: Tue Jul 12 00:20:04 2011 -0700
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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
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 a880111..56064b5 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 69abf72..9a91a7f 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
More information about the Openembedded-commits
mailing list