From: Kirill A. Korinsky <kirill@korins.ky>
Subject: lang/gcc/16: add objc++
To: OpenBSD ports <ports@openbsd.org>
Date: Sat, 10 Oct 2026 18:22:39 +0200

ports@,

here a diff where I:

1. add objc++ into gcc, I don't see any reason to add new subpackage, it
   ends with one binary;
2. remove one missed hack from gcc-15

I plan to land it in a few days, when amd64 and arm64 builds gcc-16.2.0

Both objc and objc++ was tested in triviall program on -amd64, works fine.

Thoughts?

Index: DESCR-objc
===================================================================
RCS file: /home/cvs/ports/lang/gcc/DESCR-objc,v
diff -u -p -r1.1 DESCR-objc
--- DESCR-objc	20 Dec 2007 16:11:35 -0000	1.1
+++ DESCR-objc	10 Oct 2026 15:27:44 -0000
@@ -9,4 +9,4 @@ developers, to ensure that GCC and the G
 architectures and diverse environments, and to more thoroughly test and
 extend the features of GCC.
 
-This package contains the obj C compiler.
+This package contains the obj C and C++ compilers.
Index: 16/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/gcc/16/Makefile,v
diff -u -p -r1.24 Makefile
--- 16/Makefile	9 Oct 2026 22:37:51 -0000	1.24
+++ 16/Makefile	10 Oct 2026 14:56:53 -0000
@@ -16,6 +16,7 @@ USE_NOEXECONLY = Yes
 # - turn -Wimplicit-function-declaration and -Wincompatible-pointer-types
 #   into simple warnings.
 V = 16.2.0
+REVISION = 0
 GCC_PKGSPEC = >=16,<17
 
 # aarch64, powerpc64 and sparc64 bootstrap contain only gdc
@@ -78,7 +79,7 @@ TEST_DEPENDS += devel/dejagnu \
 		devel/autogen \
 		${BUILD_PKGPATH},-libs>=16,<17
 
-LANGS = c,c++,fortran,objc
+LANGS = c,c++,fortran,objc,obj-c++
 .if ${BUILD_PACKAGES:M-ada} || ${BUILD_PACKAGES:M-dlang}
 DISTFILES.strap += ${BOOTSTRAP-${MACHINE_ARCH}}
 EXTRACT_ONLY += ${BOOTSTRAP-${MACHINE_ARCH}}
@@ -254,9 +255,6 @@ post-extract:
 .endif
 	#-chmod 644 ${WRKDIR}/bootstrap/system-libs/lib*.so* # XXX
 	#-cp `ls /usr/lib/libc.so.* | sort -t . -V | tail -1` ${WRKDIR}/bootstrap/system-libs/libc.so.* # XXX
-
-# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121386
-	rm ${WRKSRC}/gcc/gengtype-lex.cc
 
 post-install:
 .if ${BUILD_PACKAGES:M-ada}
Index: 16/pkg/PLIST-objc
===================================================================
RCS file: /home/cvs/ports/lang/gcc/16/pkg/PLIST-objc,v
diff -u -p -r1.4 PLIST-objc
--- 16/pkg/PLIST-objc	23 Jul 2026 21:09:51 -0000	1.4
+++ 16/pkg/PLIST-objc	10 Oct 2026 15:20:45 -0000
@@ -15,3 +15,4 @@ lib/gcc/${CONFIG}/${V}/include/objc/runt
 lib/gcc/${CONFIG}/${V}/include/objc/thr.h
 @static-lib lib/libobjc.a
 @bin libexec/gcc/${CONFIG}/${V}/cc1obj
+@bin libexec/gcc/${CONFIG}/${V}/cc1objplus


-- 
wbr, Kirill