diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-19 11:28:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-20 15:32:11 +0000 |
| commit | 2c2f20a9756eccafac776e45e319af7666e6da96 (patch) | |
| tree | 1b107933ffba44f06292a63b858de01670eda1fc /meta | |
| parent | b8a603d3f1d3adac41d042e42a2283b7fdf2ae7c (diff) | |
| download | openembedded-core-contrib-2c2f20a9756eccafac776e45e319af7666e6da96.tar.gz | |
libgfortran: Fix breakage from libbacktrace dependency
In 6.x and 7.x gcc, libgfortran now needs libbacktrace. Enable building of this
so that libgfortran builds correctly.
[YOCTO #12394]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/gcc/libgfortran.inc | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc index 5f5d4af758..99c192ac30 100644 --- a/meta/recipes-devtools/gcc/libgfortran.inc +++ b/meta/recipes-devtools/gcc/libgfortran.inc @@ -6,22 +6,28 @@ EXTRA_OECONF_PATHS = "\ " do_configure () { - rm -rf ${B}/${TARGET_SYS}/libgfortran/ - mkdir -p ${B}/${TARGET_SYS}/libgfortran/ - cd ${B}/${TARGET_SYS}/libgfortran/ - chmod a+x ${S}/libgfortran/configure - relpath=${@os.path.relpath("${S}/libgfortran", "${B}/${TARGET_SYS}/libgfortran")} - $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} - # Easiest way to stop bad RPATHs getting into the library since we have a - # broken libtool here - sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/libgfortran/libtool + for target in libbacktrace libgfortran + do + rm -rf ${B}/${TARGET_SYS}/$target/ + mkdir -p ${B}/${TARGET_SYS}/$target/ + cd ${B}/${TARGET_SYS}/$target/ + chmod a+x ${S}/$target/configure + relpath=${@os.path.relpath("${S}", "${B}/${TARGET_SYS}")} + ../$relpath/$target/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} + # Easiest way to stop bad RPATHs getting into the library since we have a + # broken libtool here + sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/$target/libtool + done } EXTRACONFFUNCS += "extract_stashed_builddir" do_configure[depends] += "${COMPILERDEP}" do_compile () { - cd ${B}/${TARGET_SYS}/libgfortran/ - oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/libgfortran/ + for target in libbacktrace libgfortran + do + cd ${B}/${TARGET_SYS}/$target/ + oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$target/ + done } do_install () { |