summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2024-06-13 19:51:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-06-18 08:44:41 +0100
commit5aa7391d850b6f2da1749cf00caa310972f84dca (patch)
tree808def4a2d142c9ca555ea1c5d0508ce3240e081 /meta/recipes-devtools/gcc
parent849386c44d49fcee8204f3d9a9d57e8be06ee0b6 (diff)
downloadpoky-5aa7391d850b6f2da1749cf00caa310972f84dca.tar.gz
gcc: remove g77/f77
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 (From OE-Core rev: 6469c6a00066af24c87ec5dd7994ebbc610c3782) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc13
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc19
3 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index dba25eb754..d77b2ec3d1 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -6,7 +6,7 @@ require gcc-shared-source.inc
6# These can be overridden by the version specific .inc file. 6# These can be overridden by the version specific .inc file.
7 7
8# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' 8# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
9FORTRAN ?= ",f77" 9FORTRAN ?= ",fortran"
10LANGUAGES ?= "c,c++${FORTRAN}" 10LANGUAGES ?= "c,c++${FORTRAN}"
11 11
12EXTRA_OECONF_BASE ?= "" 12EXTRA_OECONF_BASE ?= ""
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 89b0bebcfb..ad9798530f 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -43,7 +43,7 @@ RUNTIMELIBSSP ?= ""
43RUNTIMELIBSSP:mingw32 ?= "libssp" 43RUNTIMELIBSSP:mingw32 ?= "libssp"
44 44
45RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ 45RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
46 ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ 46 ${@bb.utils.contains('FORTRAN', ',fortran', 'libquadmath', '', d)} \
47" 47"
48# Only build libstdc++ for newlib 48# Only build libstdc++ for newlib
49RUNTIMETARGET:libc-newlib = "libstdc++-v3" 49RUNTIMETARGET:libc-newlib = "libstdc++-v3"
@@ -164,8 +164,6 @@ PACKAGES = "\
164 libstdc++-precompile-dev \ 164 libstdc++-precompile-dev \
165 libstdc++-dev \ 165 libstdc++-dev \
166 libstdc++-staticdev \ 166 libstdc++-staticdev \
167 libg2c \
168 libg2c-dev \
169 libssp \ 167 libssp \
170 libssp-dev \ 168 libssp-dev \
171 libssp-staticdev \ 169 libssp-staticdev \
@@ -196,15 +194,6 @@ FILES:${PN}-dbg += "\
196# So it needs to be added manually to images sadly. 194# So it needs to be added manually to images sadly.
197# RDEPENDS:${PN}-dbg += "python3-datetime" 195# RDEPENDS:${PN}-dbg += "python3-datetime"
198 196
199FILES:libg2c = "${target_libdir}/libg2c.so.*"
200SUMMARY:libg2c = "Companion runtime library for g77"
201FILES:libg2c-dev = "\
202 ${libdir}/libg2c.so \
203 ${libdir}/libg2c.a \
204 ${libdir}/libfrtbegin.a \
205"
206SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files"
207
208FILES:libstdc++ = "${libdir}/libstdc++.so.*" 197FILES:libstdc++ = "${libdir}/libstdc++.so.*"
209SUMMARY:libstdc++ = "GNU standard C++ library" 198SUMMARY:libstdc++ = "GNU standard C++ library"
210FILES:libstdc++-dev = "\ 199FILES:libstdc++-dev = "\
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 82da5ef82b..8e9693b4cb 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -33,7 +33,6 @@ PACKAGES = "\
33 ${PN} ${PN}-plugins ${PN}-symlinks \ 33 ${PN} ${PN}-plugins ${PN}-symlinks \
34 g++ g++-symlinks \ 34 g++ g++-symlinks \
35 cpp cpp-symlinks \ 35 cpp cpp-symlinks \
36 g77 g77-symlinks \
37 gfortran gfortran-symlinks \ 36 gfortran gfortran-symlinks \
38 gcov gcov-symlinks \ 37 gcov gcov-symlinks \
39 ${PN}-doc \ 38 ${PN}-doc \
@@ -81,19 +80,6 @@ FILES:${PN}-plugins = "\
81" 80"
82ALLOW_EMPTY:${PN}-plugins = "1" 81ALLOW_EMPTY:${PN}-plugins = "1"
83 82
84FILES:g77 = "\
85 ${bindir}/${TARGET_PREFIX}g77 \
86 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
87"
88FILES:g77-symlinks = "\
89 ${bindir}/g77 \
90 ${bindir}/f77 \
91"
92RRECOMMENDS:g77 = "\
93 libg2c \
94 libg2c-dev \
95"
96
97FILES:gfortran = "\ 83FILES:gfortran = "\
98 ${bindir}/${TARGET_PREFIX}gfortran \ 84 ${bindir}/${TARGET_PREFIX}gfortran \
99 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ 85 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
@@ -198,11 +184,6 @@ do_install () {
198 # Not sure why we end up with these but we don't want them... 184 # Not sure why we end up with these but we don't want them...
199 rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* 185 rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
200 186
201 # Symlinks so we can use these trivially on the target
202 if [ -e ${TARGET_PREFIX}g77 ]; then
203 ln -sf ${TARGET_PREFIX}g77 g77 || true
204 ln -sf g77 f77 || true
205 fi
206 if [ -e ${TARGET_PREFIX}gfortran ]; then 187 if [ -e ${TARGET_PREFIX}gfortran ]; then
207 ln -sf ${TARGET_PREFIX}gfortran gfortran || true 188 ln -sf ${TARGET_PREFIX}gfortran gfortran || true
208 ln -sf gfortran f95 || true 189 ln -sf gfortran f95 || true