Attachment 236029 Details for Bug 265962 – v2.1 (apply via "git am")

[patch] v2.1 (apply via "git am")

bug265962.diff (text/plain), 8.51 KB, created by Jan Beich on 2022-08-20 23:39:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2022-08-20 23:39:02 UTC

Size: 8.51 KB

patch

obsolete

>From 89ee5e9a9973f2356cb9de3e74b1190576f0bd43 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 20 Aug 2022 16:06:02 +0000
>Subject: [PATCH] lang/gcc*: expose non-default -stdlib=libc++ support
>
>gcc11: error: unrecognized command-line option '-stdlib=libc++'
>
>PR:		265962
>Approved by:	?
>---
> lang/gcc11-devel/Makefile             |  2 ++
> lang/gcc11-devel/files/patch-libcxxrt | 18 ++++++++++++++++++
> lang/gcc11/Makefile                   |  2 ++
> lang/gcc11/files/patch-libcxxrt       | 18 ++++++++++++++++++
> lang/gcc12-devel/Makefile             |  2 ++
> lang/gcc12-devel/files/patch-libcxxrt | 18 ++++++++++++++++++
> lang/gcc12/Makefile                   |  2 ++
> lang/gcc12/files/patch-libcxxrt       | 18 ++++++++++++++++++
> lang/gcc13-devel/Makefile             |  2 ++
> lang/gcc13-devel/files/patch-libcxxrt | 18 ++++++++++++++++++
> 10 files changed, 100 insertions(+)
> create mode 100644 lang/gcc11-devel/files/patch-libcxxrt
> create mode 100644 lang/gcc11/files/patch-libcxxrt
> create mode 100644 lang/gcc12-devel/files/patch-libcxxrt
> create mode 100644 lang/gcc12/files/patch-libcxxrt
> create mode 100644 lang/gcc13-devel/files/patch-libcxxrt
>
>diff --git a/lang/gcc11-devel/Makefile b/lang/gcc11-devel/Makefile
>index 2cd4251925a3..cc779acc4c12 100644
>--- a/lang/gcc11-devel/Makefile
>+++ b/lang/gcc11-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gcc
> PORTVERSION=	11.3.1.s20220819
>+PORTREVISION=	1
> CATEGORIES=	lang
> MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
> PKGNAMESUFFIX=	${SUFFIX}-devel
>@@ -103,6 +104,7 @@ CONFIGURE_ARGS+=--disable-nls \
> 		--with-as=${LOCALBASE}/bin/as \
> 		--with-gmp=${LOCALBASE} \
> 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
>+		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
> 		--with-ld=${LOCALBASE}/bin/ld \
> 		${ICONV_CONFIGURE_ARG} \
> 		--with-pkgversion="FreeBSD Ports Collection" \
>diff --git a/lang/gcc11-devel/files/patch-libcxxrt b/lang/gcc11-devel/files/patch-libcxxrt
>new file mode 100644
>index 000000000000..a02a890266ae
>--- /dev/null
>+++ b/lang/gcc11-devel/files/patch-libcxxrt
>@@ -0,0 +1,18 @@
>+libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
>+LLVM libc++abi without breaking backward compatibility. Besides, mixing
>+different C++ ABIs is not supported unless subset via DT_FILTER.
>+
>+https://github.com/llvm/llvm-project/commit/35479ffb1251
>+https://github.com/freebsd/freebsd-src/commit/cf56074e5271
>+
>+--- gcc/cp/g++spec.c.orig	2022-08-19 22:32:09 UTC
>++++ gcc/cp/g++spec.c
>+@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3.  If not see
>+ #endif
>+ 
>+ #ifndef LIBCXXABI
>+-#define LIBCXXABI "c++abi"
>++#define LIBCXXABI "cxxrt"
>+ #endif
>+ #ifndef LIBCXXABI_PROFILE
>+ #define LIBCXXABI_PROFILE LIBCXXABI
>diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile
>index e4ae2e093d06..d0b2e835375f 100644
>--- a/lang/gcc11/Makefile
>+++ b/lang/gcc11/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gcc
> PORTVERSION=	11.3.0
>+PORTREVISION=	1
> CATEGORIES=	lang
> MASTER_SITES=	GCC
> PKGNAMESUFFIX=	${SUFFIX}
>@@ -96,6 +97,7 @@ CONFIGURE_ARGS+=--disable-nls \
> 		--with-as=${LOCALBASE}/bin/as \
> 		--with-gmp=${LOCALBASE} \
> 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
>+		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
> 		--with-ld=${LOCALBASE}/bin/ld \
> 		${ICONV_CONFIGURE_ARG} \
> 		--with-pkgversion="FreeBSD Ports Collection" \
>diff --git a/lang/gcc11/files/patch-libcxxrt b/lang/gcc11/files/patch-libcxxrt
>new file mode 100644
>index 000000000000..4e8a5c34305f
>--- /dev/null
>+++ b/lang/gcc11/files/patch-libcxxrt
>@@ -0,0 +1,18 @@
>+libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
>+LLVM libc++abi without breaking backward compatibility. Besides, mixing
>+different C++ ABIs is not supported unless subset via DT_FILTER.
>+
>+https://github.com/llvm/llvm-project/commit/35479ffb1251
>+https://github.com/freebsd/freebsd-src/commit/cf56074e5271
>+
>+--- gcc/cp/g++spec.c.orig	2022-04-21 07:58:53 UTC
>++++ gcc/cp/g++spec.c
>+@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3.  If not see
>+ #endif
>+ 
>+ #ifndef LIBCXXABI
>+-#define LIBCXXABI "c++abi"
>++#define LIBCXXABI "cxxrt"
>+ #endif
>+ #ifndef LIBCXXABI_PROFILE
>+ #define LIBCXXABI_PROFILE LIBCXXABI
>diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile
>index 96d5af78e537..734df6cfe648 100644
>--- a/lang/gcc12-devel/Makefile
>+++ b/lang/gcc12-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gcc
> PORTVERSION=	12.1.1.s20220806
>+PORTREVISION=	1
> CATEGORIES=	lang
> MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
> PKGNAMESUFFIX=	${SUFFIX}-devel
>@@ -104,6 +105,7 @@ CONFIGURE_ARGS+=--disable-nls \
> 		--with-as=${LOCALBASE}/bin/as \
> 		--with-gmp=${LOCALBASE} \
> 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
>+		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
> 		--with-ld=${LOCALBASE}/bin/ld \
> 		${ICONV_CONFIGURE_ARG} \
> 		--with-pkgversion="FreeBSD Ports Collection" \
>diff --git a/lang/gcc12-devel/files/patch-libcxxrt b/lang/gcc12-devel/files/patch-libcxxrt
>new file mode 100644
>index 000000000000..3ff20d8a01d9
>--- /dev/null
>+++ b/lang/gcc12-devel/files/patch-libcxxrt
>@@ -0,0 +1,18 @@
>+libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
>+LLVM libc++abi without breaking backward compatibility. Besides, mixing
>+different C++ ABIs is not supported unless subset via DT_FILTER.
>+
>+https://github.com/llvm/llvm-project/commit/35479ffb1251
>+https://github.com/freebsd/freebsd-src/commit/cf56074e5271
>+
>+--- gcc/cp/g++spec.cc.orig	2022-08-06 22:32:19 UTC
>++++ gcc/cp/g++spec.cc
>+@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3.  If not see
>+ #endif
>+ 
>+ #ifndef LIBCXXABI
>+-#define LIBCXXABI "c++abi"
>++#define LIBCXXABI "cxxrt"
>+ #endif
>+ #ifndef LIBCXXABI_PROFILE
>+ #define LIBCXXABI_PROFILE LIBCXXABI
>diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile
>index 0eacf66f3ee3..674e6524e43b 100644
>--- a/lang/gcc12/Makefile
>+++ b/lang/gcc12/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gcc
> PORTVERSION=	12.2.0
>+PORTREVISION=	1
> CATEGORIES=	lang
> MASTER_SITES=	GCC
> PKGNAMESUFFIX=	${SUFFIX}
>@@ -96,6 +97,7 @@ CONFIGURE_ARGS+=--disable-nls \
> 		--with-as=${LOCALBASE}/bin/as \
> 		--with-gmp=${LOCALBASE} \
> 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
>+		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
> 		--with-ld=${LOCALBASE}/bin/ld \
> 		${ICONV_CONFIGURE_ARG} \
> 		--with-pkgversion="FreeBSD Ports Collection" \
>diff --git a/lang/gcc12/files/patch-libcxxrt b/lang/gcc12/files/patch-libcxxrt
>new file mode 100644
>index 000000000000..beb02cbcc480
>--- /dev/null
>+++ b/lang/gcc12/files/patch-libcxxrt
>@@ -0,0 +1,18 @@
>+libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
>+LLVM libc++abi without breaking backward compatibility. Besides, mixing
>+different C++ ABIs is not supported unless subset via DT_FILTER.
>+
>+https://github.com/llvm/llvm-project/commit/35479ffb1251
>+https://github.com/freebsd/freebsd-src/commit/cf56074e5271
>+
>+--- gcc/cp/g++spec.cc.orig	2022-08-19 08:09:52 UTC
>++++ gcc/cp/g++spec.cc
>+@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3.  If not see
>+ #endif
>+ 
>+ #ifndef LIBCXXABI
>+-#define LIBCXXABI "c++abi"
>++#define LIBCXXABI "cxxrt"
>+ #endif
>+ #ifndef LIBCXXABI_PROFILE
>+ #define LIBCXXABI_PROFILE LIBCXXABI
>diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile
>index 053c31430d1d..7aa7c002e20e 100644
>--- a/lang/gcc13-devel/Makefile
>+++ b/lang/gcc13-devel/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gcc
> PORTVERSION=	13.0.0.s20220731
>+PORTREVISION=	1
> CATEGORIES=	lang
> MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
> PKGNAMESUFFIX=	${SUFFIX}-devel
>@@ -105,6 +106,7 @@ CONFIGURE_ARGS+=--disable-nls \
> 		--with-as=${LOCALBASE}/bin/as \
> 		--with-gmp=${LOCALBASE} \
> 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
>+		--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
> 		--with-ld=${LOCALBASE}/bin/ld \
> 		${ICONV_CONFIGURE_ARG} \
> 		--with-pkgversion="FreeBSD Ports Collection" \
>diff --git a/lang/gcc13-devel/files/patch-libcxxrt b/lang/gcc13-devel/files/patch-libcxxrt
>new file mode 100644
>index 000000000000..4225df7aad1e
>--- /dev/null
>+++ b/lang/gcc13-devel/files/patch-libcxxrt
>@@ -0,0 +1,18 @@
>+libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
>+LLVM libc++abi without breaking backward compatibility. Besides, mixing
>+different C++ ABIs is not supported unless subset via DT_FILTER.
>+
>+https://github.com/llvm/llvm-project/commit/35479ffb1251
>+https://github.com/freebsd/freebsd-src/commit/cf56074e5271
>+
>+--- gcc/cp/g++spec.cc.orig	2022-07-31 22:32:16 UTC
>++++ gcc/cp/g++spec.cc
>+@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3.  If not see
>+ #endif
>+ 
>+ #ifndef LIBCXXABI
>+-#define LIBCXXABI "c++abi"
>++#define LIBCXXABI "cxxrt"
>+ #endif
>+ #ifndef LIBCXXABI_PROFILE
>+ #define LIBCXXABI_PROFILE LIBCXXABI

Actions: View | Diff

Attachments on bug 265962: 236025 | 236028 | 236029 | 236053