[OE-core] [PATCH] gcc-7.2: Fix libgfortran build

[Khem Raj]

On Wed, Nov 15, 2017 at 12:21 AM, Ricardo Ribalda Delgado
<ricardo.ribalda at gmail.com> wrote:
> Hello Khem
>
> I already did it on july
> https://patchwork.openembedded.org/patch/141497/
>
> but the patch is lost on the internet cracks :)
>

No problem, can you revive it and include with this request.

> On Wed, Nov 15, 2017 at 4:35 AM, Khem Raj <raj.khem at gmail.com> wrote:
>> On Mon, Nov 13, 2017 at 4:57 AM, Ricardo Ribalda Delgado
>> <ricardo.ribalda at gmail.com> wrote:
>>> 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
>>>
>>
>> This patch is ok.
>> while here, can you please backport this patch to gcc6 as well ?
>>
>>
>>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
>>> ---
>>>  meta/recipes-devtools/gcc/gcc-7.2.inc              |  1 +
>>>  .../gcc/gcc-7.2/0051-Fix-gfortran-build.patch      | 53 ++++++++++++++++++++++
>>>  2 files changed, 54 insertions(+)
>>>  create mode 100644 meta/recipes-devtools/gcc/gcc-7.2/0051-Fix-gfortran-build.patch
>>>
>>> diff --git a/meta/recipes-devtools/gcc/gcc-7.2.inc b/meta/recipes-devtools/gcc/gcc-7.2.inc
>>> index 1d40cba73175..ae3ed02d6ce3 100644
>>> --- a/meta/recipes-devtools/gcc/gcc-7.2.inc
>>> +++ b/meta/recipes-devtools/gcc/gcc-7.2.inc
>>> @@ -75,6 +75,7 @@ SRC_URI = "\
>>>             file://0048-gcc-Enable-static-PIE.patch \
>>>             file://fix-segmentation-fault-precompiled-hdr.patch \
>>>             file://0050-RISC-V-Handle-non-legitimate-address-in-riscv_legiti.patch \
>>> +          file://0051-Fix-gfortran-build.patch \
>>>             ${BACKPORTS} \
>>>  "
>>>  BACKPORTS = "\
>>> diff --git a/meta/recipes-devtools/gcc/gcc-7.2/0051-Fix-gfortran-build.patch b/meta/recipes-devtools/gcc/gcc-7.2/0051-Fix-gfortran-build.patch
>>> new file mode 100644
>>> index 000000000000..a71b6b0bee0e
>>> --- /dev/null
>>> +++ b/meta/recipes-devtools/gcc/gcc-7.2/0051-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.ribalda at gmail.com>
>>> +
>>> +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.15.0
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> Ricardo Ribalda