From bc5209aa5f07cea00416852532b90aba044defd5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Oct 2021 00:24:43 +0100 Subject: gcc: Drop libgfortran patch As far as I can see, when building libgfortran we don't set GFORTRAN so this patch does nothing any more. The fortran build and gcc recipes have changed massively since gcc 4.2.2 so I think this patch is simply obsolete. I did test building libgfortran with and without this patch and there was no difference, the correct fortran compiler is found. If it were an issue we should just set GFORTRAN correctly. Therefore drop the patch. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-11.2.inc | 1 - .../gcc/gcc/0008-fortran-cross-compile-hack.patch | 43 ---------------------- 2 files changed, 44 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index d39307df2b..f06c1a891b 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc @@ -36,7 +36,6 @@ SRC_URI = "\ file://0005-optional-libstdc.patch \ file://0006-COLLECT_GCC_OPTIONS.patch \ file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ - file://0008-fortran-cross-compile-hack.patch \ file://0009-cpp-honor-sysroot.patch \ file://0010-MIPS64-Default-to-N64-ABI.patch \ file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ diff --git a/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch deleted file mode 100644 index 47f611e37e..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 904d102e3ccb93296b16ceb2e283a6ccf3c1d718 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 29 Mar 2013 09:20:01 +0400 -Subject: [PATCH] fortran cross-compile hack. - -* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used -used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross -directory. - -Signed-off-by: Khem Raj - -Upstream-Status: Inappropriate [embedded specific] ---- - libgfortran/configure | 2 +- - libgfortran/configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgfortran/configure b/libgfortran/configure -index f3634389cf8..f974e874b8e 100755 ---- a/libgfortran/configure -+++ b/libgfortran/configure -@@ -13102,7 +13102,7 @@ esac - - # We need gfortran to compile parts of the library - #AC_PROG_FC(gfortran) --FC="$GFORTRAN" -+#FC="$GFORTRAN" - ac_ext=${ac_fc_srcext-f} - ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' - ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' -diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac -index 8961e314d82..49c8221cb6b 100644 ---- a/libgfortran/configure.ac -+++ b/libgfortran/configure.ac -@@ -271,7 +271,7 @@ AC_SUBST(enable_static) - - # We need gfortran to compile parts of the library - #AC_PROG_FC(gfortran) --FC="$GFORTRAN" -+#FC="$GFORTRAN" - AC_PROG_FC(gfortran) - - # extra LD Flags which are required for targets -- cgit 1.2.3-korg