openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

switch ports-gcc from 8 to 15; much of the heavy lifting for this change

Browse Source 
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).
This commit is contained in:
sthen
2025-12-12 18:19:46 +00:00
parent 14175b89f4
commit 3fb9148c44
31 changed files with 58 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devel/llvm/Makefile.inc
+1 -1
View File
@@ -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
devel/meson/Makefile
+1 -1
View File
@@ -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 \
devel/quirks/Makefile
+1 -1
View File
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-7.163
PKGNAME = quirks-7.164
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>
devel/quirks/files/Quirks.pm
+2 -1
View File
@@ -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 <espie@openbsd.org>
#
@@ -496,6 +496,7 @@ my $stem_extensions = {
'devhelp' => 'manuals',
'ipython3' => 'ipython',
'js128' => 'js140',
'g95' => 'gfortran',
};
my $obsolete_reason = {};
infrastructure/mk/arch-defines.mk
+3 -3
View File
@@ -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
infrastructure/mk/gcc4.port.mk
+1 -1
View File
@@ -1,2 +1,2 @@
MODGCC4_VERSION?=8
MODGCC4_VERSION?=15
.include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk"
lang/gcc/11/Makefile
+10 -3
View File
@@ -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 \
lang/gcc/11/pkg/PLIST-ada
-2
View File
@@ -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
lang/gcc/11/pkg/PLIST-c++
-3
View File
@@ -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++
lang/gcc/11/pkg/PLIST-dlang
+1
View File
@@ -1,3 +1,4 @@
@option is-branch
@bin bin/egdc
@bin bin/${CONFIG}-egdc
@info info/gdc.info
lang/gcc/11/pkg/PLIST-f95
+1 -3
View File
@@ -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
lang/gcc/11/pkg/PLIST-libs
+2 -5
View File
@@ -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%%
lang/gcc/11/pkg/PLIST-main
-2
View File
@@ -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
lang/gcc/11/pkg/PLIST-objc
-2
View File
@@ -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
lang/gcc/15/Makefile
+10 -3
View File
@@ -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 \
lang/gcc/15/pkg/PLIST-ada
+1 -1
View File
@@ -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
lang/gcc/15/pkg/PLIST-c++
+1 -2
View File
@@ -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++
lang/gcc/15/pkg/PLIST-dlang
+1
View File
@@ -1,3 +1,4 @@
@option is-branch
@bin bin/egdc
@bin bin/${CONFIG}-egdc
@info info/gdc.info
lang/gcc/15/pkg/PLIST-f95
+2 -2
View File
@@ -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
lang/gcc/15/pkg/PLIST-libs
+3 -4
View File
@@ -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%%
lang/gcc/15/pkg/PLIST-main
+1 -1
View File
@@ -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
lang/gcc/15/pkg/PLIST-objc
+1 -1
View File
@@ -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
lang/gcc/8/Makefile
+9 -3
View File
@@ -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 \
lang/gcc/8/pkg/PLIST-ada
-2
View File
@@ -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
lang/gcc/8/pkg/PLIST-c++
-3
View File
@@ -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++
lang/gcc/8/pkg/PLIST-f95
+1 -3
View File
@@ -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
lang/gcc/8/pkg/PLIST-libs
+2 -5
View File
@@ -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%%
lang/gcc/8/pkg/PLIST-main
-2
View File
@@ -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
lang/gcc/8/pkg/PLIST-objc
-2
View File
@@ -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
lang/gcc/DESCR-f95
+1 -1
View File
@@ -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.
lang/gcc/Makefile.inc
+2 -2
View File
@@ -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}