summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-14 02:04:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:26 +0100
commit3189c5c9cffb54d56a01df3220d8f39305654f8d (patch)
treeca12dea86265444f3390f39024d1224307ae732f
parent6834c083d6e59d4e61ddf17c1922a0e88274aa94 (diff)
downloadpoky-3189c5c9cffb54d56a01df3220d8f39305654f8d.tar.gz
libgcc: remove libgcov-dev from PACKAGES
There should be only one dev and dbg package. (From OE-Core rev: 1e9ccec936554c69ede04babee9955f25b296588) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb1
-rw-r--r--meta/recipes-devtools/gcc/libgcc.inc5
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 154a55cea2..5d1ce97c2c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -7,7 +7,6 @@ inherit packagegroup
7RDEPENDS_${PN} = "\ 7RDEPENDS_${PN} = "\
8 libgcc \ 8 libgcc \
9 libgcc-dev \ 9 libgcc-dev \
10 libgcov-dev \
11 libstdc++ \ 10 libstdc++ \
12 libstdc++-dev \ 11 libstdc++-dev \
13 ${LIBC_DEPENDENCIES} \ 12 ${LIBC_DEPENDENCIES} \
diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc
index 21cb8c1084..35432c793e 100644
--- a/meta/recipes-devtools/gcc/libgcc.inc
+++ b/meta/recipes-devtools/gcc/libgcc.inc
@@ -6,7 +6,6 @@ PACKAGES = "\
6 ${PN} \ 6 ${PN} \
7 ${PN}-dev \ 7 ${PN}-dev \
8 ${PN}-dbg \ 8 ${PN}-dbg \
9 libgcov-dev \
10" 9"
11 10
12# All libgcc source is marked with the exception. 11# All libgcc source is marked with the exception.
@@ -26,10 +25,9 @@ FILES_${PN}-dev = "\
26 ${libdir}/${TARGET_SYS}/${BINV}/n32 \ 25 ${libdir}/${TARGET_SYS}/${BINV}/n32 \
27 ${libdir}/${TARGET_SYS}/${BINV}/libgcc* \ 26 ${libdir}/${TARGET_SYS}/${BINV}/libgcc* \
28 ${@base_conditional('TARGET_SYS_NO_EXTENSION', '${TARGET_SYS}', '', '${libdir}/${TARGET_SYS_NO_EXTENSION}', d)} \ 27 ${@base_conditional('TARGET_SYS_NO_EXTENSION', '${TARGET_SYS}', '', '${libdir}/${TARGET_SYS_NO_EXTENSION}', d)} \
29"
30FILES_libgcov-dev = "\
31 ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ 28 ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
32" 29"
30
33FILES_${PN}-dbg += "${base_libdir}/.debug/" 31FILES_${PN}-dbg += "${base_libdir}/.debug/"
34 32
35LIBGCCBUILDTREENAME = "gcc-build-internal-" 33LIBGCCBUILDTREENAME = "gcc-build-internal-"
@@ -40,5 +38,4 @@ do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
40do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" 38do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
41 39
42INSANE_SKIP_${PN}-dev = "staticdev" 40INSANE_SKIP_${PN}-dev = "staticdev"
43INSANE_SKIP_${MLPREFIX}libgcov-dev = "staticdev"
44 41