i686-elf-gcc: enable support for C++

[Pierre Pronchery (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Fri Feb 28 00:47:45 2025 +0100
Changeset:	1f079b9d9f70ec57e37d8507de83f691876bcf20

Modified Files:
	i686-elf-gcc/Makefile
	i686-elf-gcc/PLIST

Log Message:
i686-elf-gcc: enable support for C++

This is now confirmed to build on NetBSD/amd64 (netbsd-9).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f079b9d9f70ec57e37d8507de83f691876bcf20

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i686-elf-gcc/Makefile | 14 +++++++-------
 i686-elf-gcc/PLIST    |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diffs:
diff --git a/i686-elf-gcc/Makefile b/i686-elf-gcc/Makefile
index 69720db671..b6a5cb1c05 100644
--- a/i686-elf-gcc/Makefile
+++ b/i686-elf-gcc/Makefile
@@ -8,7 +8,6 @@ DISTNAME=	gcc-${GCC8_DIST_VERSION}
 PKGNAME=	cross-${GCC_TARGET}-${DISTNAME}
 CATEGORIES=	cross
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC8_DIST_VERSION}/}
-DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_USING=	bsdtar
 PATCHDIR=	${.CURDIR}/../../lang/gcc8/patches
 EXTRACT_SUFX=	.tar.xz
@@ -18,17 +17,16 @@ HOMEPAGE=	https://gcc.gnu.org/
 COMMENT=	GCC for bare metal i686 ELF
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
-DISTFILES=		${DEFAULT_DISTFILES}
 EXTRACT_ONLY=		${DEFAULT_DISTFILES}
 
 # Relocations result in a linker error on AArch64, but not x86.
 MKPIE_SUPPORTED=	no
 CHECK_RELRO_SKIP+=	${GCC_PKGNAME}/lib/*
 
-DEPENDS+=		cross-${GCC_TARGET}-binutils>=2.31.1:../../cross/${GCC_TARGET}-binutils
+DEPENDS+=		cross-${GCC_TARGET}-binutils>=2.31.1:../../wip/${GCC_TARGET}-binutils
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake makeinfo sed tar:build
+USE_TOOLS+=		gmake makeinfo perl sed tar:build
 USE_TOOLS.NetBSD+=	gsed
 
 GNU_CONFIGURE=		yes
@@ -39,11 +37,11 @@ CONFIGURE_DIRS=		${OBJDIR}
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
 GCC_SUBPREFIX=		cross-${GCC_TARGET}
 GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
+
 GNU_CONFIGURE_PREFIX=	${GCC_PREFIX}
-INFO_FILES=		yes
+
 CONFIGURE_ARGS+=	--target=${GCC_TARGET}
-# TODO: make it build with c++ enabled (--enable-languages=c,c++)
-CONFIGURE_ARGS+=	--enable-languages=c
+CONFIGURE_ARGS+=	--enable-languages=c,c++
 #CONFIGURE_ARGS+=	--with-sysroot
 CONFIGURE_ARGS+=	--disable-multilib
 CONFIGURE_ARGS+=	--disable-nls
@@ -52,6 +50,8 @@ CONFIGURE_ARGS+=	--without-headers
 # doesn't know the OS. Override them to no to avoid the forbidden link tests.
 CONFIGURE_ARGS+=	target_configargs="gcc_cv_have_tls=no ac_cv_func_shl_load=no ac_cv_lib_dld_shl_load=no ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no ac_cv_lib_svld_dlopen=no ac_cv_lib_dld_dld_link=no"
 
+INFO_FILES=		yes
+
 # TODO: make it build past "checking for the value of EOF... configure: error: computing EOF failed"
 # https://stackoverflow.com/questions/72750342/gcc-cross-compiler-make-vs-make-all-gcc-why-does-one-give-me-an-error-but-the-o
 BUILD_TARGET=		all-gcc all-target-libgcc
diff --git a/i686-elf-gcc/PLIST b/i686-elf-gcc/PLIST
index 7cd531f28c..1e955d9918 100644
--- a/i686-elf-gcc/PLIST
+++ b/i686-elf-gcc/PLIST
@@ -1,5 +1,7 @@
 @comment $NetBSD$
+cross-i686-elf/bin/i686-elf-c++
 cross-i686-elf/bin/i686-elf-cpp
+cross-i686-elf/bin/i686-elf-g++
 cross-i686-elf/bin/i686-elf-gcc
 cross-i686-elf/bin/i686-elf-gcc-${PKGVERSION}
 cross-i686-elf/bin/i686-elf-gcc-ar
@@ -185,6 +187,11 @@ cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/convert.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/coretypes.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/coverage.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cp/cp-tree.def
+cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cp/cp-tree.h
+cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cp/cxx-pretty-print.h
+cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cp/name-lookup.h
+cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cp/operators.def
+cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cp/type-utils.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cppbuiltin.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cppdefault.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/cpplib.h
@@ -521,6 +528,7 @@ cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/wide-int.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/xcoff.h
 cross-i686-elf/lib/gcc/i686-elf/${PKGVERSION}/plugin/include/xcoffout.h
 cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/cc1
+cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/cc1plus
 cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/collect2
 cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/install-tools/fixinc.sh
 cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/install-tools/fixincl
@@ -531,6 +539,7 @@ cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/lto-wrapper
 cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/lto1
 cross-i686-elf/libexec/gcc/i686-elf/${PKGVERSION}/plugin/gengtype
 cross-i686-elf/man/man1/i686-elf-cpp.1
+cross-i686-elf/man/man1/i686-elf-g++.1
 cross-i686-elf/man/man1/i686-elf-gcc.1
 cross-i686-elf/man/man1/i686-elf-gcov-dump.1
 cross-i686-elf/man/man1/i686-elf-gcov-tool.1