[PATCH] gcc: let cpp rrecommend gcc.

[PATCH] gcc: let cpp rrecommend gcc.

[Ismo Puustinen]

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. Remove the attempt to install the file in cpp to
avoid confusion.

However, cpp uses cc1. If cc1 is not installed, there are error messages
such as: "cpp: error trying to exec 'cc1': execvp: No such file or
directory". Add gcc to RRECOMMENDS_cpp to fix the problem.

Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
---
 meta/recipes-devtools/gcc/gcc-target.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index f436fa2..3a2927e 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -93,8 +93,9 @@ FILES_gfortran-symlinks = "\
 FILES_cpp = "\
     ${bindir}/${TARGET_PREFIX}cpp* \
     ${base_libdir}/cpp \
-    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
+"
 FILES_cpp-symlinks = "${bindir}/cpp"
+RRECOMMENDS_cpp = "${PN}"
 
 FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \
     ${bindir}/${TARGET_PREFIX}gcov-tool* \
-- 
2.9.3

Re: [PATCH] gcc: let cpp rrecommend gcc.

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

On Thu, Mar 9, 2017 at 5:59 AM Ismo Puustinen <ismo.puustinen@intel.com>
wrote:

> 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. Remove the attempt to install the file in cpp to
> avoid confusion.



Perhaps it's better to package it in cpp and remove from gcc package

>
>
> However, cpp uses cc1. If cc1 is not installed, there are error messages
> such as: "cpp: error trying to exec 'cc1': execvp: No such file or
> directory". Add gcc to RRECOMMENDS_cpp to fix the problem.
>
> Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
> ---
>  meta/recipes-devtools/gcc/gcc-target.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-target.inc
> b/meta/recipes-devtools/gcc/gcc-target.inc
> index f436fa2..3a2927e 100644
> --- a/meta/recipes-devtools/gcc/gcc-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-target.inc
> @@ -93,8 +93,9 @@ FILES_gfortran-symlinks = "\
>  FILES_cpp = "\
>      ${bindir}/${TARGET_PREFIX}cpp* \
>      ${base_libdir}/cpp \
> -    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
> +"
>  FILES_cpp-symlinks = "${bindir}/cpp"
> +RRECOMMENDS_cpp = "${PN}"
>
>  FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \
>      ${bindir}/${TARGET_PREFIX}gcov-tool* \
> --
> 2.9.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 3145 bytes --]

Re: [PATCH] gcc: let cpp rrecommend gcc.

[Richard Purdie]

On Thu, 2017-03-09 at 15:59 +0200, Ismo Puustinen wrote:
> 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. Remove the attempt to install the file in cpp
> to
> avoid confusion.
> 
> However, cpp uses cc1. If cc1 is not installed, there are error
> messages
> such as: "cpp: error trying to exec 'cc1': execvp: No such file or
> directory". Add gcc to RRECOMMENDS_cpp to fix the problem.
> 
> Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
> ---
>  meta/recipes-devtools/gcc/gcc-target.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

If its fatal without it shouldn't it be an RDEPENDS?

Cheers,

Richard

Re: [PATCH] gcc: let cpp rrecommend gcc.

[Puustinen, Ismo]

On Thu, 2017-03-09 at 14:17 +0000, Khem Raj wrote:
> > 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. Remove the attempt to install the file in cpp
> > to
> > avoid confusion.
> 
> 
> Perhaps it's better to package it in cpp and remove from gcc package

Maybe you're right -- that's how my Fedora system appears to be doing
it. I'll prepare a new patch.

Ismo

[PATCH v2] gcc: move cc1 binary file to package cpp.

[Ismo Puustinen]

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>
---
 meta/recipes-devtools/gcc/gcc-target.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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} \
-- 
2.9.3