aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmo Puustinen <ismo.puustinen@intel.com>2017-03-10 12:10:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 15:37:05 +0000
commit4bf84edeb6cf4ba82a21bc7ceb1da4f59d839064 (patch)
treeb0a9785f5ab665e3967a09e14c6a8119b4083947
parent468f9c9899016c46635c9f39eef3483303a5be81 (diff)
downloadopenembedded-core-contrib-4bf84edeb6cf4ba82a21bc7ceb1da4f59d839064.zip
openembedded-core-contrib-4bf84edeb6cf4ba82a21bc7ceb1da4f59d839064.tar.gz
openembedded-core-contrib-4bf84edeb6cf4ba82a21bc7ceb1da4f59d839064.tar.bz2
gcc: move cc1 binary file to package cpp.
The file /usr/libexec/gcc/.../cc1 has been installed in package gcc instead of package cpp, because FILES statements for both packages match the cc1 binary. Move the file to package cpp and add cpp to RDEPENDS_gcc to fix the dependency. Having the cc1 binary in cpp fixes errors such as: "cpp: error trying to exec 'cc1': execvp: No such file or directory". Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index f436fa2..b245bdd 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -31,7 +31,7 @@ PACKAGES = "\
FILES_${PN} = "\
${bindir}/${TARGET_PREFIX}gcc* \
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \
@@ -46,6 +46,7 @@ RRECOMMENDS_${PN} += "\
libssp \
libssp-dev \
"
+RDEPENDS_${PN} += "cpp"
FILES_${PN}-dev = "\
${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \