summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-22 16:40:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:21 +0000
commiteccece9553cac5a8fa4bd95263945cc2f40cf96b (patch)
tree1ce080843f4098e4ee0cc5d66b092685b9fd703a
parent307fcba065e26e33f8ee922e2116291c8796bb85 (diff)
downloadpoky-eccece9553cac5a8fa4bd95263945cc2f40cf96b.tar.gz
gcc: move shared .a to their own package
Keep the *_nonshared.a in the libgcc-dev package as required for linking, moved the other *.a libraries into their respective packages (libstdc++ and libssp). (From OE-Core rev: c2838d949ffd15282c72551b40c5fd81d0db1fa0) 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-runtime.inc9
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index ca0d41d6e4..758c93ea88 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3PR = "r21" 3PR = "r22"
4 4
5# Third digit in PV should be incremented after a minor release 5# Third digit in PV should be incremented after a minor release
6# happens from this branch on gcc e.g. currently its 4.6.0 6# 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 7ac68f2f83..feb8735e05 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -3,10 +3,12 @@ PACKAGES = "\
3 libstdc++ \ 3 libstdc++ \
4 libstdc++-precompile-dev \ 4 libstdc++-precompile-dev \
5 libstdc++-dev \ 5 libstdc++-dev \
6 libstdc++-staticdev \
6 libg2c \ 7 libg2c \
7 libg2c-dev \ 8 libg2c-dev \
8 libssp \ 9 libssp \
9 libssp-dev \ 10 libssp-dev \
11 libssp-staticdev \
10 libgfortran \ 12 libgfortran \
11 libgfortran-dev \ 13 libgfortran-dev \
12 libmudflap \ 14 libmudflap \
@@ -31,8 +33,9 @@ FILES_libstdc++-dev = "\
31 ${includedir}/c++/ \ 33 ${includedir}/c++/ \
32 ${libdir}/libstdc++.so \ 34 ${libdir}/libstdc++.so \
33 ${libdir}/libstdc++.la \ 35 ${libdir}/libstdc++.la \
36 ${libdir}/libsupc++.la"
37FILES_libstdc++-staticdev = "\
34 ${libdir}/libstdc++.a \ 38 ${libdir}/libstdc++.a \
35 ${libdir}/libsupc++.la \
36 ${libdir}/libsupc++.a" 39 ${libdir}/libsupc++.a"
37 40
38FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" 41FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
@@ -40,9 +43,11 @@ FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
40FILES_libssp = "${libdir}/libssp.so.*" 43FILES_libssp = "${libdir}/libssp.so.*"
41FILES_libssp-dev = " \ 44FILES_libssp-dev = " \
42 ${libdir}/libssp*.so \ 45 ${libdir}/libssp*.so \
43 ${libdir}/libssp*.a \ 46 ${libdir}/libssp*_nonshared.a \
44 ${libdir}/libssp*.la \ 47 ${libdir}/libssp*.la \
45 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp" 48 ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp"
49FILES_libssp-staticdev = " \
50 ${libdir}/libssp*.a"
46 51
47FILES_libgfortran = "${libdir}/libgfortran.so.*" 52FILES_libgfortran = "${libdir}/libgfortran.so.*"
48FILES_libgfortran-dev = " \ 53FILES_libgfortran-dev = " \