Update for gfortran
v2 cover Update for gfortran
From: Kai Kang <[email protected]>
v2:
* add sub-package gfortran conditionally
Kai Kang (2):
gfortran: update runtime dependencies
gcc: remove g77/f77
.../gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-runtime.inc | 13 +-------- meta/recipes-devtools/gcc/gcc-target.inc | 28 +++++-------------- 3 files changed, 9 insertions(+), 34 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 gfortran: update runtime dependencies
From: Kai Kang <[email protected]>
It fails to run both gcc and gfortran with errors:
| root@qemux86-64:~# x86_64-poky-linux-gcc a.c
| x86_64-poky-linux-gcc: fatal error: cannot execute 'as': posix_spawnp: No such file or directory
then add binutils which provides as to RDEPENDS of gcc.
libgfortran-dev provides libgfortran.spec which required by gfortran:
| root@qemux86-64:~# gfortran hello.f95
| gfortran: fatal error: cannot read spec file 'libgfortran.spec': No such file or directory
And gcc provides liblto_plugin.so:
| root@qemux86-64:~# gfortran hello.f95
| gfortran: fatal error: '-fuse-linker-plugin', but liblto_plugin.so not found
--- meta/recipes-devtools/gcc/gcc-target.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-devtools/gcc/gcc-target.inc +7 -2
@@ -34,7 +34,7 @@ PACKAGES = "\ g++ g++-symlinks \ cpp cpp-symlinks \ g77 g77-symlinks \ - gfortran gfortran-symlinks \ + ${@bb.utils.contains('FORTRAN', ',fortran', 'gfortran gfortran-symlinks', '', d)} \ gcov gcov-symlinks \ ${PN}-doc \ ${PN}-dev \
@@ -61,7 +61,7 @@ RRECOMMENDS:${PN} += "\ libssp \ libssp-dev \ " -RDEPENDS:${PN} += "cpp" +RDEPENDS:${PN} += "binutils cpp" FILES:${PN}-dev = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
@@ -94,10 +94,15 @@ RRECOMMENDS:g77 = "\ libg2c-dev \ " +INSANE_SKIP:gfortran += "dev-deps" FILES:gfortran = "\ ${bindir}/${TARGET_PREFIX}gfortran \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ " +RDEPENDS:gfortran = "\ + gcc \ + libgfortran-dev \ +" RRECOMMENDS:gfortran = "\ libquadmath \ libquadmath-dev \
Signature · 1 line
2.34.1
PATCH v2 2/2 gcc: remove g77/f77
In reply to [email protected]From: Kai Kang <[email protected]>
g77/f77 has been removed from gcc 4.0.0 via commit:
* b4117c30610 Makefile.def, [...]: Remove all mention of libf2c.
When set
FORTRAN = ",f77"
it complains with error:
| The following requested languages could not be built: f77 | Supported languages are: c,c,c++,fortran,go,lto,m2,objc,obj-c++
So remove g77/f77 from gcc recipes.
[1]: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b4117c30610
--- .../gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-runtime.inc | 13 +------------ meta/recipes-devtools/gcc/gcc-target.inc | 19 ------------------- 3 files changed, 2 insertions(+), 32 deletions(-)
meta/recipes-devtools/gcc/gcc-configure-common.inc +1 -1
@@ -6,7 +6,7 @@ require gcc-shared-source.inc # These can be overridden by the version specific .inc file. # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' -FORTRAN ?= ",f77" +FORTRAN ?= ",fortran" LANGUAGES ?= "c,c++${FORTRAN}" EXTRA_OECONF_BASE ?= ""
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -12
@@ -43,7 +43,7 @@ RUNTIMELIBSSP ?= "" RUNTIMELIBSSP:mingw32 ?= "libssp" RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ - ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ + ${@bb.utils.contains('FORTRAN', ',fortran', 'libquadmath', '', d)} \ " # Only build libstdc++ for newlib RUNTIMETARGET:libc-newlib = "libstdc++-v3"
@@ -164,8 +164,6 @@ PACKAGES = "\ libstdc++-precompile-dev \ libstdc++-dev \ libstdc++-staticdev \ - libg2c \ - libg2c-dev \ libssp \ libssp-dev \ libssp-staticdev \
@@ -196,15 +194,6 @@ FILES:${PN}-dbg += "\ # So it needs to be added manually to images sadly. # RDEPENDS:${PN}-dbg += "python3-datetime" -FILES:libg2c = "${target_libdir}/libg2c.so.*" -SUMMARY:libg2c = "Companion runtime library for g77" -FILES:libg2c-dev = "\ - ${libdir}/libg2c.so \ - ${libdir}/libg2c.a \ - ${libdir}/libfrtbegin.a \ -" -SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files" - FILES:libstdc++ = "${libdir}/libstdc++.so.*" SUMMARY:libstdc++ = "GNU standard C++ library" FILES:libstdc++-dev = "\
meta/recipes-devtools/gcc/gcc-target.inc +0 -19
@@ -33,7 +33,6 @@ PACKAGES = "\ ${PN} ${PN}-plugins ${PN}-symlinks \ g++ g++-symlinks \ cpp cpp-symlinks \ - g77 g77-symlinks \ ${@bb.utils.contains('FORTRAN', ',fortran', 'gfortran gfortran-symlinks', '', d)} \ gcov gcov-symlinks \ ${PN}-doc \
@@ -81,19 +80,6 @@ FILES:${PN}-plugins = "\ " ALLOW_EMPTY:${PN}-plugins = "1" -FILES:g77 = "\ - ${bindir}/${TARGET_PREFIX}g77 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ -" -FILES:g77-symlinks = "\ - ${bindir}/g77 \ - ${bindir}/f77 \ -" -RRECOMMENDS:g77 = "\ - libg2c \ - libg2c-dev \ -" - INSANE_SKIP:gfortran += "dev-deps" FILES:gfortran = "\ ${bindir}/${TARGET_PREFIX}gfortran \
@@ -203,11 +189,6 @@ do_install () { # Not sure why we end up with these but we don't want them... rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* - # Symlinks so we can use these trivially on the target - if [ -e ${TARGET_PREFIX}g77 ]; then - ln -sf ${TARGET_PREFIX}g77 g77 || true - ln -sf g77 f77 || true - fi if [ -e ${TARGET_PREFIX}gfortran ]; then ln -sf ${TARGET_PREFIX}gfortran gfortran || true ln -sf gfortran f95 || true
Signature · 1 line
2.34.1