[2/2] gcc: remove g77/f77

From: Kai Kang <kai.kang@windriver.com>

g77/f77 has been removed from gcc 4.0.0 via commit:

* b4117c30610 Makefile.def, [...]: Remove all mention of libf2c.

When set

    FORTRAN = ",f77"

it complains with error:

| The following requested languages could not be built: f77
| Supported languages are: c,c,c++,fortran,go,lto,m2,objc,obj-c++

So remove g77/f77 from gcc recipes.

[1]: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b4117c30610

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../gcc/gcc-configure-common.inc              |  2 +-
 meta/recipes-devtools/gcc/gcc-runtime.inc     | 13 +------------
 meta/recipes-devtools/gcc/gcc-target.inc      | 19 -------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

On Thu, Jun 13, 2024 at 4:53 AM Kai Kang via lists.openembedded.org
<kai.kang=windriver.com@lists.openembedded.org> wrote:
>
> From: Kai Kang <kai.kang@windriver.com>
>
> g77/f77 has been removed from gcc 4.0.0 via commit:
>
> * b4117c30610 Makefile.def, [...]: Remove all mention of libf2c.
>
> When set
>
>     FORTRAN = ",f77"
>
> it complains with error:
>
> | The following requested languages could not be built: f77
> | Supported languages are: c,c,c++,fortran,go,lto,m2,objc,obj-c++
>
> So remove g77/f77 from gcc recipes.

Looks fine to me.

>
> [1]: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b4117c30610
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  .../gcc/gcc-configure-common.inc              |  2 +-
>  meta/recipes-devtools/gcc/gcc-runtime.inc     | 13 +------------
>  meta/recipes-devtools/gcc/gcc-target.inc      | 19 -------------------
>  3 files changed, 2 insertions(+), 32 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> index dba25eb754..d77b2ec3d1 100644
> --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> @@ -6,7 +6,7 @@ require gcc-shared-source.inc
>  # These can be overridden by the version specific .inc file.
>
>  # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
> -FORTRAN ?= ",f77"
> +FORTRAN ?= ",fortran"
>  LANGUAGES ?= "c,c++${FORTRAN}"
>
>  EXTRA_OECONF_BASE ?= ""
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
> index 89b0bebcfb..ad9798530f 100644
> --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> @@ -43,7 +43,7 @@ RUNTIMELIBSSP ?= ""
>  RUNTIMELIBSSP:mingw32 ?= "libssp"
>
>  RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
> -    ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \
> +    ${@bb.utils.contains('FORTRAN', ',fortran', 'libquadmath', '', d)} \
>  "
>  # Only build libstdc++ for newlib
>  RUNTIMETARGET:libc-newlib = "libstdc++-v3"
> @@ -164,8 +164,6 @@ PACKAGES = "\
>      libstdc++-precompile-dev \
>      libstdc++-dev \
>      libstdc++-staticdev \
> -    libg2c \
> -    libg2c-dev \
>      libssp \
>      libssp-dev \
>      libssp-staticdev \
> @@ -196,15 +194,6 @@ FILES:${PN}-dbg += "\
>  # So it needs to be added manually to images sadly.
>  # RDEPENDS:${PN}-dbg += "python3-datetime"
>
> -FILES:libg2c = "${target_libdir}/libg2c.so.*"
> -SUMMARY:libg2c = "Companion runtime library for g77"
> -FILES:libg2c-dev = "\
> -    ${libdir}/libg2c.so \
> -    ${libdir}/libg2c.a \
> -    ${libdir}/libfrtbegin.a \
> -"
> -SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files"
> -
>  FILES:libstdc++ = "${libdir}/libstdc++.so.*"
>  SUMMARY:libstdc++ = "GNU standard C++ library"
>  FILES:libstdc++-dev = "\
> diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
> index 6ab83449ea..42eac6fc43 100644
> --- a/meta/recipes-devtools/gcc/gcc-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-target.inc
> @@ -33,7 +33,6 @@ PACKAGES = "\
>      ${PN} ${PN}-plugins ${PN}-symlinks \
>      g++ g++-symlinks \
>      cpp cpp-symlinks \
> -    g77 g77-symlinks \
>      gfortran gfortran-symlinks \
>      gcov gcov-symlinks \
>      ${PN}-doc \
> @@ -81,19 +80,6 @@ FILES:${PN}-plugins = "\
>  "
>  ALLOW_EMPTY:${PN}-plugins = "1"
>
> -FILES:g77 = "\
> -    ${bindir}/${TARGET_PREFIX}g77 \
> -    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
> -"
> -FILES:g77-symlinks = "\
> -    ${bindir}/g77 \
> -    ${bindir}/f77 \
> -"
> -RRECOMMENDS:g77 = "\
> -    libg2c \
> -    libg2c-dev \
> -"
> -
>  INSANE_SKIP:gfortran += "dev-deps"
>  FILES:gfortran = "\
>      ${bindir}/${TARGET_PREFIX}gfortran \
> @@ -203,11 +189,6 @@ do_install () {
>         # Not sure why we end up with these but we don't want them...
>         rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
>
> -       # Symlinks so we can use these trivially on the target
> -       if [ -e ${TARGET_PREFIX}g77 ]; then
> -               ln -sf ${TARGET_PREFIX}g77 g77 || true
> -               ln -sf g77 f77 || true
> -       fi
>         if [ -e ${TARGET_PREFIX}gfortran ]; then
>                 ln -sf ${TARGET_PREFIX}gfortran gfortran || true
>                 ln -sf gfortran f95 || true
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#200597): https://lists.openembedded.org/g/openembedded-core/message/200597
> Mute This Topic: https://lists.openembedded.org/mt/106650042/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

On Thu, 2024-06-13 at 09:58 -0700, Khem Raj via lists.openembedded.org
wrote:
> On Thu, Jun 13, 2024 at 4:53 AM Kai Kang via lists.openembedded.org
> <kai.kang=windriver.com@lists.openembedded.org> wrote:
> > 
> > From: Kai Kang <kai.kang@windriver.com>
> > 
> > g77/f77 has been removed from gcc 4.0.0 via commit:
> > 
> > * b4117c30610 Makefile.def, [...]: Remove all mention of libf2c.
> > 
> > When set
> > 
> >     FORTRAN = ",f77"
> > 
> > it complains with error:
> > 
> > > The following requested languages could not be built: f77
> > > Supported languages are: c,c,c++,fortran,go,lto,m2,objc,obj-c++
> > 
> > So remove g77/f77 from gcc recipes.
> 
> Looks fine to me.

Agreed, this looks like good cleanup thanks!

I'll queue for testing.

Cheers,

Richard