Index | Thread | Search

From:
Rafael Sadowski <rafael@sizeofvoid.org>
Subject:
Re: Remove gcc3 from ports
To:
Stuart Henderson <stu@spacehopper.org>
Cc:
ports@openbsd.org
Date:
Fri, 24 Oct 2025 09:16:45 +0200

Download raw body.

Thread
On Fri Oct 24, 2025 at 07:19:36AM +0100, Stuart Henderson wrote:
> there are some NOT_FOR_ARCHS= ${GCC3_ARCHS} that need to go before you can
> remove GCC3_ARCHS
> 

Yes thanks!

Index: archivers/pigz/Makefile
===================================================================
RCS file: /cvs/ports/archivers/pigz/Makefile,v
diff -u -p -r1.16 Makefile
--- archivers/pigz/Makefile	5 Sep 2023 14:59:18 -0000	1.16
+++ archivers/pigz/Makefile	24 Oct 2025 07:13:31 -0000
@@ -1,6 +1,3 @@
-# __builtin_clz
-NOT_FOR_ARCHS=	${GCC3_ARCHS}
-
 COMMENT =	parallel implementation of gzip utilizing multiple cores
 
 DISTNAME =	pigz-2.8
Index: audio/celt/Makefile
===================================================================
RCS file: /cvs/ports/audio/celt/Makefile,v
diff -u -p -r1.23 Makefile
--- audio/celt/Makefile	5 Sep 2023 16:13:36 -0000	1.23
+++ audio/celt/Makefile	24 Oct 2025 07:13:32 -0000
@@ -2,9 +2,6 @@ PORTROACH =	limit:^0\.11\.1
 
 # The CELT codec has been merged into the IETF Opus codec and is now obsolete
 
-# invalid use of `restrict'
-NOT_FOR_ARCHS=	${GCC3_ARCHS}
-
 COMMENT =	experimental ultra-low delay audio codec
 
 DISTNAME =	celt-0.11.1
Index: databases/kyotocabinet/Makefile
===================================================================
RCS file: /cvs/ports/databases/kyotocabinet/Makefile,v
diff -u -p -r1.31 Makefile
--- databases/kyotocabinet/Makefile	20 Sep 2023 13:30:06 -0000	1.31
+++ databases/kyotocabinet/Makefile	24 Oct 2025 07:13:34 -0000
@@ -1,8 +1,5 @@
 BROKEN-hppa=	undefined reference to __sync_fetch_and_add_8
 
-# requires C++ tr1 headers
-NOT_FOR_ARCHS=		${GCC3_ARCHS}
-
 COMMENT=	straightforward implementation of DBM
 
 DISTNAME=	kyotocabinet-1.2.80
Index: devel/gettext/Makefile
===================================================================
RCS file: /cvs/ports/devel/gettext/Makefile,v
diff -u -p -r1.109 Makefile
--- devel/gettext/Makefile	24 Jan 2025 16:39:35 -0000	1.109
+++ devel/gettext/Makefile	24 Oct 2025 07:13:36 -0000
@@ -45,7 +45,7 @@ DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 # on critical path to lang/gcc.  XXX c++ used in libasprintf but seems
 # unused at present; may need to revisit if this changes
-COMPILER =		base-clang base-gcc gcc3
+COMPILER =		base-clang base-gcc
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--disable-csharp \
Index: devel/glib2mm/Makefile
===================================================================
RCS file: /cvs/ports/devel/glib2mm/Makefile,v
diff -u -p -r1.120 Makefile
--- devel/glib2mm/Makefile	18 Mar 2025 07:54:26 -0000	1.120
+++ devel/glib2mm/Makefile	24 Oct 2025 07:13:36 -0000
@@ -1,8 +1,5 @@
 PORTROACH=		limit:^2\.66
 
-# g++3 chokes on the code
-NOT_FOR_ARCHS=		${GCC3_ARCHS}
-
 COMMENT=		C++ interface for glib2
 
 GNOME_PROJECT=		glibmm
Index: devel/libaudiofile/Makefile
===================================================================
RCS file: /cvs/ports/devel/libaudiofile/Makefile,v
diff -u -p -r1.66 Makefile
--- devel/libaudiofile/Makefile	2 Jan 2024 12:31:44 -0000	1.66
+++ devel/libaudiofile/Makefile	24 Oct 2025 07:13:36 -0000
@@ -1,6 +1,3 @@
-# -fvisibility
-NOT_FOR_ARCHS=	${GCC3_ARCHS}
-
 COMMENT=	SGI audiofile library clone
 
 V=		0.3.6
Index: devel/py-gobject3/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-gobject3/Makefile,v
diff -u -p -r1.97 Makefile
--- devel/py-gobject3/Makefile	4 Jun 2025 17:51:50 -0000	1.97
+++ devel/py-gobject3/Makefile	24 Oct 2025 07:13:40 -0000
@@ -29,7 +29,7 @@ MODPY_PYBUILD=		setuptools
 
 # XXX https://bugzilla.gnome.org/show_bug.cgi?id=737874
 MODULES +=		gcc4
-MODGCC4_ARCHS=		${GCC3_ARCHS} ${GCC4_ARCHS}
+MODGCC4_ARCHS=		${GCC4_ARCHS}
 
 BUILD_DEPENDS=		graphics/py-cairo
 
Index: devel/sparsehash/Makefile
===================================================================
RCS file: /cvs/ports/devel/sparsehash/Makefile,v
diff -u -p -r1.16 Makefile
--- devel/sparsehash/Makefile	2 Sep 2023 20:12:38 -0000	1.16
+++ devel/sparsehash/Makefile	24 Oct 2025 07:13:42 -0000
@@ -1,6 +1,3 @@
-# g++3 chokes on the code
-NOT_FOR_ARCHS=	${GCC3_ARCHS}
-
 COMMENT =		memory-efficient hash_map and hash_set C++ classes
 V=			2.0.4
 GH_ACCOUNT =		sparsehash
Index: infrastructure/bin/portcheck
===================================================================
RCS file: /cvs/ports/infrastructure/bin/portcheck,v
diff -u -p -r1.149 portcheck
--- infrastructure/bin/portcheck	26 Feb 2025 14:22:53 -0000	1.149
+++ infrastructure/bin/portcheck	24 Oct 2025 07:13:49 -0000
@@ -887,7 +887,7 @@ sub_checks() {
 					fi
 				fi
 
-				[[ "$compiler" == "base-clang base-gcc gcc3" ]] \
+				[[ "$compiler" == "base-clang base-gcc" ]] \
 				    && default_compiler=true
 
 				check_wantlib "$portref" "$modules" \
Index: infrastructure/mk/arch-defines.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/arch-defines.mk,v
diff -u -p -r1.111 arch-defines.mk
--- infrastructure/mk/arch-defines.mk	21 Jul 2025 02:31:26 -0000	1.111
+++ infrastructure/mk/arch-defines.mk	24 Oct 2025 07:13:49 -0000
@@ -20,8 +20,7 @@ APM_ARCHS = arm64 amd64 i386 loongson ma
 BE_ARCHS = hppa m88k mips64 powerpc powerpc64 sparc64
 LE_ARCHS = aarch64 alpha amd64 arm i386 mips64el riscv64 sh
 LP64_ARCHS = aarch64 alpha amd64 mips64 mips64el powerpc64 riscv64 sparc64
-GCC4_ARCHS = alpha hppa sh sparc64
-GCC3_ARCHS = m88k
+GCC4_ARCHS = alpha hppa sh sparc64 m88k
 # arches where certain ports are available
 MONO_ARCHS = aarch64 amd64 i386
 GO_ARCHS = aarch64 amd64 arm i386 riscv64
@@ -46,7 +45,7 @@ GCC49_ARCHS = aarch64 alpha amd64 arm hp
 CXX11_ARCHS = ${CLANG_ARCHS} ${GCC49_ARCHS}
 DEBUGINFO_ARCHS = aarch64 amd64
 
-.for PROP in ALL APM BE LE LP64 CLANG GCC4 GCC3 GCC49 MONO LLVM LUAJIT \
+.for PROP in ALL APM BE LE LP64 CLANG GCC4 GCC49 MONO LLVM LUAJIT \
                      CXX11 OCAML_NATIVE OCAML_NATIVE_DYNLINK GO \
                      LLD RUST DEBUGINFO
 .  for A B in ${MACHINE_ARCH} ${ARCH}
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
diff -u -p -r1.1645 bsd.port.mk
--- infrastructure/mk/bsd.port.mk	30 Jul 2025 12:06:30 -0000	1.1645
+++ infrastructure/mk/bsd.port.mk	24 Oct 2025 07:13:49 -0000
@@ -320,14 +320,12 @@ PORTROACH ?=
 
 # this only happens if we exit modules without having ever gone
 # thru compiler.port.mk - update portcheck if changing COMPILER default
-COMPILER ?= base-clang base-gcc gcc3
+COMPILER ?= base-clang base-gcc
 COMPILER_LANGS ?= c c++
 .if ${PROPERTIES:Mclang}
 CHOSEN_COMPILER ?= base-clang
-.elif ${PROPERTIES:Mgcc4}
-CHOSEN_COMPILER ?= base-gcc
 .else
-CHOSEN_COMPILER ?= gcc3
+CHOSEN_COMPILER ?= base-gcc
 .endif
 COMPILER_LIBCXX ?= ${LIBCXX}
 
Index: infrastructure/mk/compiler.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/compiler.port.mk,v
diff -u -p -r1.5 compiler.port.mk
--- infrastructure/mk/compiler.port.mk	17 Nov 2017 00:24:01 -0000	1.5
+++ infrastructure/mk/compiler.port.mk	24 Oct 2025 07:13:49 -0000
@@ -30,11 +30,6 @@ _COMPILER_ARCHS += ${GCC4_ARCHS}
 .    if ${PROPERTIES:Mgcc4}
 CHOSEN_COMPILER ?= base-gcc
 .    endif
-.  elif "$c" == "gcc3"
-_COMPILER_ARCHS += ${GCC3_ARCHS}
-.    if ${PROPERTIES:Mgcc3}
-CHOSEN_COMPILER ?= gcc3
-.    endif
 .  elif "$c" == "base-clang"
 _COMPILER_ARCHS += ${CLANG_ARCHS}
 .    if ${PROPERTIES:Mclang}
Index: infrastructure/templates/mk.conf.template
===================================================================
RCS file: /cvs/ports/infrastructure/templates/mk.conf.template,v
diff -u -p -r1.40 mk.conf.template
--- infrastructure/templates/mk.conf.template	25 Jul 2025 10:33:16 -0000	1.40
+++ infrastructure/templates/mk.conf.template	24 Oct 2025 07:13:49 -0000
@@ -28,7 +28,6 @@
 .poison LIB_DEPEDNS
 .poison LIB_DEPEMDS
 .poison LIB_DEPEND
-.poison MODGCC3_ARCHES
 .poison MODGCC4_ARCHES
 .poison MODGNOME_DESKTOP_FILE
 .poison MODGNOME_ICON_CACHE
Index: net/libtorrent/Makefile
===================================================================
RCS file: /cvs/ports/net/libtorrent/Makefile,v
diff -u -p -r1.70 Makefile
--- net/libtorrent/Makefile	17 Sep 2025 14:00:11 -0000	1.70
+++ net/libtorrent/Makefile	24 Oct 2025 07:13:58 -0000
@@ -3,9 +3,6 @@ COMMENT=		BitTorrent library written in 
 BROKEN-hppa =		undefined references to __sync atomic ops
 BROKEN-sh =		undefined references to __sync atomic ops
 
-# requires C++ tr1 headers
-NOT_FOR_ARCHS=		${GCC3_ARCHS}
-
 DISTNAME=		libtorrent-0.15.7
 EPOCH=			0
 SHARED_LIBS +=  	torrent 23.0	# .18.0
Index: textproc/icu4c/Makefile
===================================================================
RCS file: /cvs/ports/textproc/icu4c/Makefile,v
diff -u -p -r1.104 Makefile
--- textproc/icu4c/Makefile	5 May 2025 11:48:50 -0000	1.104
+++ textproc/icu4c/Makefile	24 Oct 2025 07:14:11 -0000
@@ -1,5 +1,3 @@
-NOT_FOR_ARCHS=		${GCC3_ARCHS}
-
 COMMENT-main=		International Components for Unicode
 COMMENT-wwwdata=	ICU data file for use with /var/www chroot jails