From 3fb9148c44d7cfdfe94a99b2d01e087c827bd39a Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 12 Dec 2025 18:19:46 +0000 Subject: [PATCH] switch ports-gcc from 8 to 15; much of the heavy lifting for this change was done by claudio@. clean cargo-culted cruft in PLISTs (e.g. @conflict for things where there's already a default @conflict). rename g95 package to gfortran while there. bump _SYSTEM_VERSION to avoid bumping ERANGE ports (much of the ports tree on sparc64 depends on ports-gcc). --- devel/llvm/Makefile.inc | 2 +- devel/meson/Makefile | 2 +- devel/quirks/Makefile | 2 +- devel/quirks/files/Quirks.pm | 3 ++- infrastructure/mk/arch-defines.mk | 6 +++--- infrastructure/mk/gcc4.port.mk | 2 +- lang/gcc/11/Makefile | 13 ++++++++++--- lang/gcc/11/pkg/PLIST-ada | 2 -- lang/gcc/11/pkg/PLIST-c++ | 3 --- lang/gcc/11/pkg/PLIST-dlang | 1 + lang/gcc/11/pkg/PLIST-f95 | 4 +--- lang/gcc/11/pkg/PLIST-libs | 7 ++----- lang/gcc/11/pkg/PLIST-main | 2 -- lang/gcc/11/pkg/PLIST-objc | 2 -- lang/gcc/15/Makefile | 13 ++++++++++--- lang/gcc/15/pkg/PLIST-ada | 2 +- lang/gcc/15/pkg/PLIST-c++ | 3 +-- lang/gcc/15/pkg/PLIST-dlang | 1 + lang/gcc/15/pkg/PLIST-f95 | 4 ++-- lang/gcc/15/pkg/PLIST-libs | 7 +++---- lang/gcc/15/pkg/PLIST-main | 2 +- lang/gcc/15/pkg/PLIST-objc | 2 +- lang/gcc/8/Makefile | 12 +++++++++--- lang/gcc/8/pkg/PLIST-ada | 2 -- lang/gcc/8/pkg/PLIST-c++ | 3 --- lang/gcc/8/pkg/PLIST-f95 | 4 +--- lang/gcc/8/pkg/PLIST-libs | 7 ++----- lang/gcc/8/pkg/PLIST-main | 2 -- lang/gcc/8/pkg/PLIST-objc | 2 -- lang/gcc/DESCR-f95 | 2 +- lang/gcc/Makefile.inc | 4 ++-- 31 files changed, 58 insertions(+), 65 deletions(-) diff --git a/devel/llvm/Makefile.inc b/devel/llvm/Makefile.inc index 8ff734cc3ab..70e63460397 100644 --- a/devel/llvm/Makefile.inc +++ b/devel/llvm/Makefile.inc @@ -175,7 +175,7 @@ MODPY_ADJ_FILES += \ ../clang/utils/hmaptool/hmaptool # XXX sync -GCC_VER = 8.4.0 +GCC_VER = 15.2.0 # do not include OSREV GCC_CONFIG = ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 3f6103185b5..de709365f12 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -43,7 +43,7 @@ TEST_IS_INTERACTIVE= Yes TEST_DEPENDS= devel/git \ devel/jdk/11 \ devel/mercurial \ - g95->=8,<9:lang/gcc/8,-f95 \ + lang/gcc/15,-f95 \ lang/mono \ lang/rust \ lang/vala \ diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index ad199d1470a..eb96c09c58c 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-7.163 +PKGNAME = quirks-7.164 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 6e50265f356..a3109ebc1d4 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1768 2025/11/19 20:53:28 sthen Exp $ +# $OpenBSD: Quirks.pm,v 1.1769 2025/12/12 18:19:46 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -496,6 +496,7 @@ my $stem_extensions = { 'devhelp' => 'manuals', 'ipython3' => 'ipython', 'js128' => 'js140', + 'g95' => 'gfortran', }; my $obsolete_reason = {}; diff --git a/infrastructure/mk/arch-defines.mk b/infrastructure/mk/arch-defines.mk index 45d4283c1d6..47d00c3db38 100644 --- a/infrastructure/mk/arch-defines.mk +++ b/infrastructure/mk/arch-defines.mk @@ -1,4 +1,4 @@ -# $OpenBSD: arch-defines.mk,v 1.113 2025/11/14 17:46:39 sthen Exp $ +# $OpenBSD: arch-defines.mk,v 1.114 2025/12/12 18:19:46 sthen Exp $ # # ex:ts=4 sw=4 filetype=make: # @@ -61,7 +61,7 @@ LIBCXX = c++ c++abi pthread LIBECXX = c++ c++abi pthread .else LIBCXX = stdc++ pthread -LIBECXX = estdc++>=17 pthread +LIBECXX = estdc++>=21 pthread .endif .if ${PROPERTIES:Mlld} || defined(USE_LLD) && ${USE_LLD:L} == yes @@ -85,7 +85,7 @@ LLD_EMUL = .endif # system version wide specifics -_SYSTEM_VERSION = 2 +_SYSTEM_VERSION = 3 _SYSTEM_VERSION-aarch64 = 8 _SYSTEM_VERSION-amd64 = 9 _SYSTEM_VERSION-arm = 6 diff --git a/infrastructure/mk/gcc4.port.mk b/infrastructure/mk/gcc4.port.mk index d95b1480b00..da9a2625098 100644 --- a/infrastructure/mk/gcc4.port.mk +++ b/infrastructure/mk/gcc4.port.mk @@ -1,2 +1,2 @@ -MODGCC4_VERSION?=8 +MODGCC4_VERSION?=15 .include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk" diff --git a/lang/gcc/11/Makefile b/lang/gcc/11/Makefile index 428436d9f9c..e061b4336e5 100644 --- a/lang/gcc/11/Makefile +++ b/lang/gcc/11/Makefile @@ -15,7 +15,8 @@ USE_NOEXECONLY = Yes V = 11.2.0 FULL_VERSION = $V FULL_PKGVERSION = $V -REVISION = 21 +GCC_PKGSPEC = >=11,<12 +REVISION = 22 # aarch64 bootstrap contains only gdc ADASTRAP-aarch64 = adastrap-aarch64-$V-0.tar.xz @@ -30,13 +31,19 @@ ADASTRAP-powerpc = adastrap-powerpc-$V-4.tar.xz #ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz PKGNAME-main = gcc-${FULL_PKGVERSION} +PKGSPEC-main = gcc-${GCC_PKGSPEC} PKGNAME-libs = gcc-libs-${FULL_PKGVERSION} +PKGSPEC-libs = gcc-libs-${GCC_PKGSPEC} PKGNAME-c++ = g++-${FULL_PKGVERSION} -PKGNAME-f95 = g95-${FULL_PKGVERSION} +PKGSPEC-c++ = g++-${GCC_PKGSPEC} +PKGNAME-f95 = gfortran-${FULL_PKGVERSION} +PKGSPEC-f95 = gfortran-${GCC_PKGSPEC} PKGNAME-objc = gobjc-${FULL_PKGVERSION} +PKGSPEC-objc = gobjc-${GCC_PKGSPEC} PKGNAME-ada = gnat-${FULL_PKGVERSION} +PKGSPEC-ada = gnat-${GCC_PKGSPEC} PKGNAME-dlang = gdc-${FULL_PKGVERSION} -PKGSPEC-main = gcc->=11,<12 +PKGSPEC-dlang = gdc-${GCC_PKGSPEC} SHARED_LIBS = estdc++ 20.0 \ gfortran 9.0 \ diff --git a/lang/gcc/11/pkg/PLIST-ada b/lang/gcc/11/pkg/PLIST-ada index 18d73cacf09..47688a67e95 100644 --- a/lang/gcc/11/pkg/PLIST-ada +++ b/lang/gcc/11/pkg/PLIST-ada @@ -1,6 +1,4 @@ @option is-branch -@conflict gnat-<12 -@pkgpath lang/gcc/4.9,-ada @bin bin/gnat @bin bin/gnatbind @bin bin/gnatchop diff --git a/lang/gcc/11/pkg/PLIST-c++ b/lang/gcc/11/pkg/PLIST-c++ index be5bce49298..7580732897a 100644 --- a/lang/gcc/11/pkg/PLIST-c++ +++ b/lang/gcc/11/pkg/PLIST-c++ @@ -1,7 +1,4 @@ @option is-branch -@conflict gcc-libs->=12 -@conflict g++-<12 -@pkgpath lang/gcc/4.9,-c++ @bin bin/ec++ @bin bin/eg++ @bin bin/${CONFIG}-ec++ diff --git a/lang/gcc/11/pkg/PLIST-dlang b/lang/gcc/11/pkg/PLIST-dlang index fd73120dcd6..696acedcd35 100644 --- a/lang/gcc/11/pkg/PLIST-dlang +++ b/lang/gcc/11/pkg/PLIST-dlang @@ -1,3 +1,4 @@ +@option is-branch @bin bin/egdc @bin bin/${CONFIG}-egdc @info info/gdc.info diff --git a/lang/gcc/11/pkg/PLIST-f95 b/lang/gcc/11/pkg/PLIST-f95 index 828e712ccd8..ce6db2c9c80 100644 --- a/lang/gcc/11/pkg/PLIST-f95 +++ b/lang/gcc/11/pkg/PLIST-f95 @@ -1,8 +1,6 @@ @option is-branch -@conflict gfortran-* +@conflict g95-* @conflict libgfortran-* -@conflict g95-<12 -@pkgpath lang/gcc/4.9,-f95 @bin bin/egfortran @bin bin/${CONFIG}-egfortran @info info/gfortran.info diff --git a/lang/gcc/11/pkg/PLIST-libs b/lang/gcc/11/pkg/PLIST-libs index 123604f9ec2..7f2ebe59dd3 100644 --- a/lang/gcc/11/pkg/PLIST-libs +++ b/lang/gcc/11/pkg/PLIST-libs @@ -1,17 +1,14 @@ -@option no-default-conflict @option is-branch -@conflict gcc-libs-<12 -@pkgpath lang/gcc/4.9,-libs lib/libatomic.la @lib lib/libatomic.so.${LIBatomic_VERSION} lib/libcc1.la @lib lib/libcc1.so.${LIBcc1_VERSION} -%%ITM%% lib/libestdc++.la @lib lib/libestdc++.so.${LIBestdc++_VERSION} lib/libestdc++.so.${LIBestdc++_VERSION}-gdb.py lib/libgfortran.la @lib lib/libgfortran.so.${LIBgfortran_VERSION} -%%QUADMATH%% lib/libobjc.la @lib lib/libobjc.so.${LIBobjc_VERSION} +%%ITM%% +%%QUADMATH%% diff --git a/lang/gcc/11/pkg/PLIST-main b/lang/gcc/11/pkg/PLIST-main index 957ed008d0c..6dc94b2ddcf 100644 --- a/lang/gcc/11/pkg/PLIST-main +++ b/lang/gcc/11/pkg/PLIST-main @@ -1,6 +1,4 @@ @option is-branch -@conflict gcc-<12 -@pkgpath lang/gcc/4.9,-main @bin bin/ecpp @bin bin/egcc @bin bin/egcc-ar diff --git a/lang/gcc/11/pkg/PLIST-objc b/lang/gcc/11/pkg/PLIST-objc index bc16e12ad2b..3af64b14bac 100644 --- a/lang/gcc/11/pkg/PLIST-objc +++ b/lang/gcc/11/pkg/PLIST-objc @@ -1,6 +1,4 @@ @option is-branch -@conflict gobjc-<12 -@pkgpath lang/gcc/4.9,-objc lib/gcc/${CONFIG}/${V}/include/objc/ lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h lib/gcc/${CONFIG}/${V}/include/objc/Object.h diff --git a/lang/gcc/15/Makefile b/lang/gcc/15/Makefile index adde9e2f93d..ff5edce29b7 100644 --- a/lang/gcc/15/Makefile +++ b/lang/gcc/15/Makefile @@ -18,8 +18,9 @@ USE_NOEXECONLY = Yes V = 15.2.0 FULL_VERSION = $V FULL_PKGVERSION = $V +GCC_PKGSPEC = >=15,<16 -REVISION = 4 +REVISION = 5 # aarch64 bootstrap contains only gdc ADASTRAP-aarch64 = adastrap-aarch64-11.2.0-0.tar.xz @@ -32,13 +33,19 @@ ADASTRAP-powerpc = adastrap-powerpc-11.2.0-3.tar.xz ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz PKGNAME-main = gcc-${FULL_PKGVERSION} +PKGSPEC-main = gcc-${GCC_PKGSPEC} PKGNAME-libs = gcc-libs-${FULL_PKGVERSION} +PKGSPEC-libs = gcc-libs-${GCC_PKGSPEC} PKGNAME-c++ = g++-${FULL_PKGVERSION} -PKGNAME-f95 = g95-${FULL_PKGVERSION} +PKGSPEC-c++ = g++-${GCC_PKGSPEC} +PKGNAME-f95 = gfortran-${FULL_PKGVERSION} +PKGSPEC-f95 = gfortran-${GCC_PKGSPEC} PKGNAME-objc = gobjc-${FULL_PKGVERSION} +PKGSPEC-objc = gobjc-${GCC_PKGSPEC} PKGNAME-ada = gnat-${FULL_PKGVERSION} +PKGSPEC-ada = gnat-${GCC_PKGSPEC} PKGNAME-dlang = gdc-${FULL_PKGVERSION} -PKGSPEC-main = gcc->=15,<16 +PKGSPEC-dlang = gdc-${GCC_PKGSPEC} SHARED_LIBS = estdc++ 21.0 \ gfortran 10.0 \ diff --git a/lang/gcc/15/pkg/PLIST-ada b/lang/gcc/15/pkg/PLIST-ada index 7111e6d09ca..0bade96b044 100644 --- a/lang/gcc/15/pkg/PLIST-ada +++ b/lang/gcc/15/pkg/PLIST-ada @@ -1,6 +1,6 @@ @option is-branch -@conflict gnat-<16 @pkgpath lang/gcc/4.9,-ada +@pkgpath lang/gcc/8,-ada @bin bin/gnat @bin bin/gnatbind @bin bin/gnatchop diff --git a/lang/gcc/15/pkg/PLIST-c++ b/lang/gcc/15/pkg/PLIST-c++ index b227aa02165..bf1bafbf3c7 100644 --- a/lang/gcc/15/pkg/PLIST-c++ +++ b/lang/gcc/15/pkg/PLIST-c++ @@ -1,7 +1,6 @@ @option is-branch -@conflict gcc-libs->=16 -@conflict g++-<16 @pkgpath lang/gcc/4.9,-c++ +@pkgpath lang/gcc/8,-c++ @bin bin/ec++ @bin bin/eg++ @bin bin/${CONFIG}-ec++ diff --git a/lang/gcc/15/pkg/PLIST-dlang b/lang/gcc/15/pkg/PLIST-dlang index b89790caea2..ab28a6a964c 100644 --- a/lang/gcc/15/pkg/PLIST-dlang +++ b/lang/gcc/15/pkg/PLIST-dlang @@ -1,3 +1,4 @@ +@option is-branch @bin bin/egdc @bin bin/${CONFIG}-egdc @info info/gdc.info diff --git a/lang/gcc/15/pkg/PLIST-f95 b/lang/gcc/15/pkg/PLIST-f95 index 72c3789ab52..a96a8c0290a 100644 --- a/lang/gcc/15/pkg/PLIST-f95 +++ b/lang/gcc/15/pkg/PLIST-f95 @@ -1,8 +1,8 @@ @option is-branch -@conflict gfortran-* +@conflict g95-* @conflict libgfortran-* -@conflict g95-<16 @pkgpath lang/gcc/4.9,-f95 +@pkgpath lang/gcc/8,-f95 @bin bin/egfortran @bin bin/${CONFIG}-egfortran @info info/gfortran.info diff --git a/lang/gcc/15/pkg/PLIST-libs b/lang/gcc/15/pkg/PLIST-libs index 53e72e61ef0..516ad382627 100644 --- a/lang/gcc/15/pkg/PLIST-libs +++ b/lang/gcc/15/pkg/PLIST-libs @@ -1,17 +1,16 @@ -@option no-default-conflict @option is-branch -@conflict gcc-libs-<16 @pkgpath lang/gcc/4.9,-libs +@pkgpath lang/gcc/8,-libs lib/libatomic.la @lib lib/libatomic.so.${LIBatomic_VERSION} lib/libcc1.la @lib lib/libcc1.so.${LIBcc1_VERSION} -%%ITM%% lib/libestdc++.la @lib lib/libestdc++.so.${LIBestdc++_VERSION} lib/libestdc++.so.21.0-gdb.py lib/libgfortran.la @lib lib/libgfortran.so.${LIBgfortran_VERSION} -%%QUADMATH%% lib/libobjc.la @lib lib/libobjc.so.${LIBobjc_VERSION} +%%ITM%% +%%QUADMATH%% diff --git a/lang/gcc/15/pkg/PLIST-main b/lang/gcc/15/pkg/PLIST-main index 960d99ec163..892d0157524 100644 --- a/lang/gcc/15/pkg/PLIST-main +++ b/lang/gcc/15/pkg/PLIST-main @@ -1,6 +1,6 @@ @option is-branch -@conflict gcc-<16 @pkgpath lang/gcc/4.9,-main +@pkgpath lang/gcc/8,-main @bin bin/ecpp @bin bin/egcc @bin bin/egcc-ar diff --git a/lang/gcc/15/pkg/PLIST-objc b/lang/gcc/15/pkg/PLIST-objc index 41da16a8e4a..e5602233aad 100644 --- a/lang/gcc/15/pkg/PLIST-objc +++ b/lang/gcc/15/pkg/PLIST-objc @@ -1,6 +1,6 @@ @option is-branch -@conflict gobjc-<16 @pkgpath lang/gcc/4.9,-objc +@pkgpath lang/gcc/8,-objc lib/gcc/${CONFIG}/${V}/include/objc/ lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h lib/gcc/${CONFIG}/${V}/include/objc/Object.h diff --git a/lang/gcc/8/Makefile b/lang/gcc/8/Makefile index 6bb82323005..688bde713bb 100644 --- a/lang/gcc/8/Makefile +++ b/lang/gcc/8/Makefile @@ -23,7 +23,8 @@ USE_NOEXECONLY = Yes V = 8.4.0 FULL_VERSION = $V FULL_PKGVERSION = $V -REVISION = 30 +GCC_PKGSPEC = >=8,<9 +REVISION = 31 ADASTRAP-amd64 = adastrap-amd64-$V-4.tar.xz ADASTRAP-hppa = adastrap-hppa-$V-1.tar.xz @@ -36,12 +37,17 @@ ADASTRAP-powerpc = adastrap-powerpc-$V-3.tar.xz #ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz PKGNAME-main = gcc-${FULL_PKGVERSION} +PKGSPEC-main = gcc-${GCC_PKGSPEC} PKGNAME-libs = gcc-libs-${FULL_PKGVERSION} +PKGSPEC-libs = gcc-libs-${GCC_PKGSPEC} PKGNAME-c++ = g++-${FULL_PKGVERSION} -PKGNAME-f95 = g95-${FULL_PKGVERSION} +PKGSPEC-c++ = g++-${GCC_PKGSPEC} +PKGNAME-f95 = gfortran-${FULL_PKGVERSION} +PKGSPEC-f95 = gfortran-${GCC_PKGSPEC} PKGNAME-objc = gobjc-${FULL_PKGVERSION} +PKGSPEC-objc = gobjc-${GCC_PKGSPEC} PKGNAME-ada = gnat-${FULL_PKGVERSION} -PKGSPEC-main = gcc->=8,<9 +PKGSPEC-ada = gnat-${GCC_PKGSPEC} SHARED_LIBS = estdc++ 19.0 \ gfortran 8.0 \ diff --git a/lang/gcc/8/pkg/PLIST-ada b/lang/gcc/8/pkg/PLIST-ada index 2a0f182e8df..5185eb0fc56 100644 --- a/lang/gcc/8/pkg/PLIST-ada +++ b/lang/gcc/8/pkg/PLIST-ada @@ -1,6 +1,4 @@ @option is-branch -@conflict gnat-<9 -@pkgpath lang/gcc/4.9,-ada @bin bin/gnat @bin bin/gnatbind @bin bin/gnatchop diff --git a/lang/gcc/8/pkg/PLIST-c++ b/lang/gcc/8/pkg/PLIST-c++ index 339494ee6a3..79c98236b0d 100644 --- a/lang/gcc/8/pkg/PLIST-c++ +++ b/lang/gcc/8/pkg/PLIST-c++ @@ -1,7 +1,4 @@ @option is-branch -@conflict gcc-libs->=9 -@conflict g++-<9 -@pkgpath lang/gcc/4.9,-c++ @bin bin/ec++ @bin bin/eg++ @bin bin/${CONFIG}-ec++ diff --git a/lang/gcc/8/pkg/PLIST-f95 b/lang/gcc/8/pkg/PLIST-f95 index fd05e37ee69..a9403db4e55 100644 --- a/lang/gcc/8/pkg/PLIST-f95 +++ b/lang/gcc/8/pkg/PLIST-f95 @@ -1,8 +1,6 @@ @option is-branch -@conflict gfortran-* +@conflict g95-* @conflict libgfortran-* -@conflict g95-<9 -@pkgpath lang/gcc/4.9,-f95 @bin bin/egfortran @bin bin/${CONFIG}-egfortran @info info/gfortran.info diff --git a/lang/gcc/8/pkg/PLIST-libs b/lang/gcc/8/pkg/PLIST-libs index 81b172b4f8c..4aa3e08bdce 100644 --- a/lang/gcc/8/pkg/PLIST-libs +++ b/lang/gcc/8/pkg/PLIST-libs @@ -1,16 +1,13 @@ -@option no-default-conflict @option is-branch -@conflict gcc-libs-<9 -@pkgpath lang/gcc/4.9,-libs lib/libatomic.la @lib lib/libatomic.so.${LIBatomic_VERSION} +lib/libcc1.la +@lib lib/libcc1.so.${LIBcc1_VERSION} lib/libestdc++.la @lib lib/libestdc++.so.${LIBestdc++_VERSION} lib/libgfortran.la @lib lib/libgfortran.so.${LIBgfortran_VERSION} lib/libobjc.la @lib lib/libobjc.so.${LIBobjc_VERSION} -lib/libcc1.la -@lib lib/libcc1.so.${LIBcc1_VERSION} %%ITM%% %%QUADMATH%% diff --git a/lang/gcc/8/pkg/PLIST-main b/lang/gcc/8/pkg/PLIST-main index 729a8a4ae94..e6d81a9c33f 100644 --- a/lang/gcc/8/pkg/PLIST-main +++ b/lang/gcc/8/pkg/PLIST-main @@ -1,6 +1,4 @@ @option is-branch -@conflict gcc-<9 -@pkgpath lang/gcc/4.9,-main @bin bin/ecpp @bin bin/egcc @bin bin/egcc-ar diff --git a/lang/gcc/8/pkg/PLIST-objc b/lang/gcc/8/pkg/PLIST-objc index 873b9a30224..3af64b14bac 100644 --- a/lang/gcc/8/pkg/PLIST-objc +++ b/lang/gcc/8/pkg/PLIST-objc @@ -1,6 +1,4 @@ @option is-branch -@conflict gobjc-<9 -@pkgpath lang/gcc/4.9,-objc lib/gcc/${CONFIG}/${V}/include/objc/ lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h lib/gcc/${CONFIG}/${V}/include/objc/Object.h diff --git a/lang/gcc/DESCR-f95 b/lang/gcc/DESCR-f95 index e36aefbad45..7fcffa1655b 100644 --- a/lang/gcc/DESCR-f95 +++ b/lang/gcc/DESCR-f95 @@ -9,4 +9,4 @@ developers, to ensure that GCC and the GNU system work on multiple architectures and diverse environments, and to more thoroughly test and extend the features of GCC. -This package contains the f95 compiler. +This package contains the Fortran compiler. diff --git a/lang/gcc/Makefile.inc b/lang/gcc/Makefile.inc index 91cbcfd1dcd..5425889765f 100644 --- a/lang/gcc/Makefile.inc +++ b/lang/gcc/Makefile.inc @@ -11,7 +11,7 @@ COMMENT-main= ${COMMENT} COMMENT-libs= ${COM}: support libs COMMENT-c++ = ${COM}: C++ compiler COMMENT-estdc= ${COM}: C++ compiler library -COMMENT-f95= ${COM}: f95 compiler +COMMENT-f95= ${COM}: Fortran compiler COMMENT-objc= ${COM}: obj C compiler COMMENT-ada= ${COM}: Ada compiler COMMENT-go= ${COM}: Go compiler @@ -21,7 +21,7 @@ PKGNAME?= gcc-${FULL_PKGVERSION} PKGNAME-libs?= gcc-libs-${FULL_PKGVERSION} PKGNAME-c++ ?= g++-${FULL_PKGVERSION} PKGNAME-estdc?= libstdc++-${FULL_PKGVERSION} -PKGNAME-f95?= g95-${FULL_PKGVERSION} +PKGNAME-f95?= gfortran-${FULL_PKGVERSION} PKGNAME-objc?= gobjc-${FULL_PKGVERSION} PKGNAME-ada?= gnat-${FULL_PKGVERSION} PKGNAME-go?= gccgo-${FULL_PKGVERSION}