Patchwork [20/20] gcc: refactor packages for staticdev

login
register
mail settings
Submitter Saul Wold
Date Jan. 21, 2012, 5:18 a.m.
Message ID <a6a863bec95ca8b6835a5515062fe8a48b6c3e06.1327123057.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19911/
State New
Headers show

Comments

Saul Wold - Jan. 21, 2012, 5:18 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.6.inc             |    2 +-
 meta/recipes-devtools/gcc/gcc-package-runtime.inc |    9 +++++++--
 meta/recipes-devtools/gcc/libgcc_4.6.bb           |    4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)
Phil Blundell - Jan. 22, 2012, 8:40 p.m.
On Fri, 2012-01-20 at 21:18 -0800, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-devtools/gcc/gcc-4.6.inc             |    2 +-
>  meta/recipes-devtools/gcc/gcc-package-runtime.inc |    9 +++++++--
>  meta/recipes-devtools/gcc/libgcc_4.6.bb           |    4 +++-
>  3 files changed, 11 insertions(+), 4 deletions(-)

This patch has no long commit message at all, and it seems to do
something with "libgcov-dev" which I wouldn't have guessed from the
terse summary in the subject line.  Can you add some more commentary
about what is going on with that?

Please see the guidance on the wiki:

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Headers_and_Commit_Messages

which is quite explicit that "[i]t is not acceptable to have an empty or
non-existent header, or just a single line message. The summary and
description is required for all changes."

thanks

p.

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 4bbb2d2..541b473 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 = "r20"
+PR = "r21"
 
 # 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-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index 7ac68f2..feb8735 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -3,10 +3,12 @@  PACKAGES = "\
   libstdc++ \
   libstdc++-precompile-dev \
   libstdc++-dev \
+  libstdc++-staticdev \
   libg2c \
   libg2c-dev \
   libssp \
   libssp-dev \
+  libssp-staticdev \
   libgfortran \
   libgfortran-dev \
   libmudflap \
@@ -31,8 +33,9 @@  FILES_libstdc++-dev = "\
   ${includedir}/c++/ \
   ${libdir}/libstdc++.so \
   ${libdir}/libstdc++.la \
+  ${libdir}/libsupc++.la"
+FILES_libstdc++-staticdev = "\
   ${libdir}/libstdc++.a \
-  ${libdir}/libsupc++.la \
   ${libdir}/libsupc++.a"
 
 FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
@@ -40,9 +43,11 @@  FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
 FILES_libssp = "${libdir}/libssp.so.*"
 FILES_libssp-dev = " \
   ${libdir}/libssp*.so \
-  ${libdir}/libssp*.a \
+  ${libdir}/libssp*_nonshared.a \
   ${libdir}/libssp*.la \
   ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp"
+FILES_libssp-staticdev = " \
+  ${libdir}/libssp*.a"
 
 FILES_libgfortran = "${libdir}/libgfortran.so.*"
 FILES_libgfortran-dev = " \
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index dd0a7be..0c50988 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -7,14 +7,16 @@  PACKAGES = "\
   ${PN} \
   ${PN}-dev \
   ${PN}-dbg \
+  libgcov-dev \
   "
 
 FILES_${PN} = "${base_libdir}/libgcc*.so.*"
 FILES_${PN}-dev = " \
   ${base_libdir}/libgcc*.so \
   ${libdir}/${TARGET_SYS}/${BINV}/crt* \
-  ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
+FILES_libgcov-dev = " \
+  ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
 
 FILES_${PN}-dbg += "${base_libdir}/.debug/"