Without this patch libbacktrace cannot be included/link during libgfortran build.
libbtool: link: cannot find the library `../libbacktrace/libbacktrace.la' or unhandled argument `../libbacktrace/libbacktrace.la Suggested-by: Khem Raj <[email protected]> Signed-off-by: Ricardo Ribalda Delgado <[email protected]> --- meta/recipes-devtools/gcc/gcc-7.1.inc | 1 + .../gcc/gcc-7.1/0048-Fix-gfortran-build.patch | 53 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-7.1/0048-Fix-gfortran-build.patch diff --git a/meta/recipes-devtools/gcc/gcc-7.1.inc b/meta/recipes-devtools/gcc/gcc-7.1.inc index 4098d6a2c1e0..e142cdf79433 100644 --- a/meta/recipes-devtools/gcc/gcc-7.1.inc +++ b/meta/recipes-devtools/gcc/gcc-7.1.inc @@ -72,6 +72,7 @@ SRC_URI = "\ file://0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ file://0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ file://0047-sync-gcc-stddef.h-with-musl.patch \ + file://0048-Fix-gfortran-build.patch \ ${BACKPORTS} \ " BACKPORTS = "\ diff --git a/meta/recipes-devtools/gcc/gcc-7.1/0048-Fix-gfortran-build.patch b/meta/recipes-devtools/gcc/gcc-7.1/0048-Fix-gfortran-build.patch new file mode 100644 index 000000000000..a71b6b0bee0e --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.1/0048-Fix-gfortran-build.patch @@ -0,0 +1,53 @@ +Without this patch libbacktrace cannot be included/link during +libgfortran build. + +libbtool: link: cannot find the library `../libbacktrace/libbacktrace.la' +or unhandled argument `../libbacktrace/libbacktrace.la' + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ricardo Ribalda Delgado <[email protected]> + +diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am +index 2857af5943f9..e07760069a3c 100644 +--- a/libgfortran/Makefile.am ++++ b/libgfortran/Makefile.am +@@ -37,7 +37,7 @@ toolexeclib_LTLIBRARIES = libgfortran.la + toolexeclib_DATA = libgfortran.spec + libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) + libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ +- $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ ++ $(LTLDFLAGS) $(LIBQUADLIB) ../../libbacktrace/libbacktrace.la \ + $(HWCAP_LDFLAGS) \ + -lm $(extra_ldflags_libgfortran) \ + $(version_arg) -Wc,-shared-libgcc +@@ -64,7 +64,7 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ + -I$(MULTIBUILDTOP)../libgcc \ + -I$(srcdir)/$(MULTISRCTOP)../libbacktrace \ + -I$(MULTIBUILDTOP)../libbacktrace \ +- -I../libbacktrace ++ -I../../libbacktrace + + # Fortran rules for complex multiplication and division + AM_CFLAGS += -fcx-fortran-rules +diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in +index 05b183dcadb0..c9e0280e412c 100644 +--- a/libgfortran/Makefile.in ++++ b/libgfortran/Makefile.in +@@ -581,7 +581,7 @@ toolexeclib_LTLIBRARIES = libgfortran.la + toolexeclib_DATA = libgfortran.spec + libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) + libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ +- $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ ++ $(LTLDFLAGS) $(LIBQUADLIB) ../../libbacktrace/libbacktrace.la \ + $(HWCAP_LDFLAGS) \ + -lm $(extra_ldflags_libgfortran) \ + $(version_arg) -Wc,-shared-libgcc +@@ -602,7 +602,7 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ + -I$(MULTIBUILDTOP)../libgcc \ + -I$(srcdir)/$(MULTISRCTOP)../libbacktrace \ + -I$(MULTIBUILDTOP)../libbacktrace \ +- -I../libbacktrace ++ -I../../libbacktrace + + gfor_io_src = io/size_from_kind.c $(am__append_2) + gfor_io_headers = \ -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
