From: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
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'
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
Signed-off-by: Khem Raj <raj.k...@gmail.com>
---
meta/recipes-devtools/gcc/gcc-6.4.inc | 1 +
.../gcc/gcc-6.4/0057-Fix-gfortran-build.patch | 53 ++++++++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100644
meta/recipes-devtools/gcc/gcc-6.4/0057-Fix-gfortran-build.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.4.inc
b/meta/recipes-devtools/gcc/gcc-6.4.inc
index 03f2bf045d..a191fd70a3 100644
--- a/meta/recipes-devtools/gcc/gcc-6.4.inc
+++ b/meta/recipes-devtools/gcc/gcc-6.4.inc
@@ -76,6 +76,7 @@ SRC_URI = "\
file://0054_all_nopie-all-flags.patch \
file://0055-unwind_h-glibc26.patch \
file://0056-LRA-PR70904-relax-the-restriction-on-subreg-reload-f.patch \
+ file://0057-Fix-gfortran-build.patch \
${BACKPORTS} \
"
BACKPORTS = "\
diff --git a/meta/recipes-devtools/gcc/gcc-6.4/0057-Fix-gfortran-build.patch
b/meta/recipes-devtools/gcc/gcc-6.4/0057-Fix-gfortran-build.patch
new file mode 100644
index 0000000000..30b135b978
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-6.4/0057-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 <ricardo.riba...@gmail.com>
+
+diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
+index 39d3e11d223c..b5efe6dfe195 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 \
+ -lm $(extra_ldflags_libgfortran) \
+ $(version_arg) -Wc,-shared-libgcc
+ libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec
$(LIBQUADLIB_DEP)
+@@ -63,7 +63,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 7ed080cf7b0d..d197fbd6b683 100644
+--- a/libgfortran/Makefile.in
++++ b/libgfortran/Makefile.in
+@@ -598,7 +598,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 \
+ -lm $(extra_ldflags_libgfortran) \
+ $(version_arg) -Wc,-shared-libgcc
+
+@@ -618,7 +618,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.15.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
