Attachment #236029 for bug #265962

Lines 1-5 Link Here

(-)b/lang/gcc11-devel/Makefile (+2 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 11.3.1.s20220819	2	PORTVERSION= 11.3.1.s20220819
		3	PORTREVISION= 1
3	CATEGORIES= lang	4	CATEGORIES= lang
4	MASTER_SITES= GCC/snapshots/${DIST_VERSION}	5	MASTER_SITES= GCC/snapshots/${DIST_VERSION}
5	PKGNAMESUFFIX= ${SUFFIX}-devel	6	PKGNAMESUFFIX= ${SUFFIX}-devel
Lines 103-108 CONFIGURE_ARGS+=--disable-nls \ Link Here
103	--with-as=${LOCALBASE}/bin/as \	104	--with-as=${LOCALBASE}/bin/as \
104	--with-gmp=${LOCALBASE} \	105	--with-gmp=${LOCALBASE} \
105	--with-gxx-include-dir=${TARGLIB}/include/c++/ \	106	--with-gxx-include-dir=${TARGLIB}/include/c++/ \
		107	--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
106	--with-ld=${LOCALBASE}/bin/ld \	108	--with-ld=${LOCALBASE}/bin/ld \
107	${ICONV_CONFIGURE_ARG} \	109	${ICONV_CONFIGURE_ARG} \
108	--with-pkgversion="FreeBSD Ports Collection" \	110	--with-pkgversion="FreeBSD Ports Collection" \




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

Lines 1-5 Link Here

(-)b/lang/gcc11/Makefile (+2 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 11.3.0	2	PORTVERSION= 11.3.0
		3	PORTREVISION= 1
3	CATEGORIES= lang	4	CATEGORIES= lang
4	MASTER_SITES= GCC	5	MASTER_SITES= GCC
5	PKGNAMESUFFIX= ${SUFFIX}	6	PKGNAMESUFFIX= ${SUFFIX}
Lines 96-101 CONFIGURE_ARGS+=--disable-nls \ Link Here
96	--with-as=${LOCALBASE}/bin/as \	97	--with-as=${LOCALBASE}/bin/as \
97	--with-gmp=${LOCALBASE} \	98	--with-gmp=${LOCALBASE} \
98	--with-gxx-include-dir=${TARGLIB}/include/c++/ \	99	--with-gxx-include-dir=${TARGLIB}/include/c++/ \
		100	--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
99	--with-ld=${LOCALBASE}/bin/ld \	101	--with-ld=${LOCALBASE}/bin/ld \
100	${ICONV_CONFIGURE_ARG} \	102	${ICONV_CONFIGURE_ARG} \
101	--with-pkgversion="FreeBSD Ports Collection" \	103	--with-pkgversion="FreeBSD Ports Collection" \




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

Lines 1-5 Link Here

(-)b/lang/gcc12-devel/Makefile (+2 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 12.1.1.s20220806	2	PORTVERSION= 12.1.1.s20220806
		3	PORTREVISION= 1
3	CATEGORIES= lang	4	CATEGORIES= lang
4	MASTER_SITES= GCC/snapshots/${DIST_VERSION}	5	MASTER_SITES= GCC/snapshots/${DIST_VERSION}
5	PKGNAMESUFFIX= ${SUFFIX}-devel	6	PKGNAMESUFFIX= ${SUFFIX}-devel
Lines 104-109 CONFIGURE_ARGS+=--disable-nls \ Link Here
104	--with-as=${LOCALBASE}/bin/as \	105	--with-as=${LOCALBASE}/bin/as \
105	--with-gmp=${LOCALBASE} \	106	--with-gmp=${LOCALBASE} \
106	--with-gxx-include-dir=${TARGLIB}/include/c++/ \	107	--with-gxx-include-dir=${TARGLIB}/include/c++/ \
		108	--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
107	--with-ld=${LOCALBASE}/bin/ld \	109	--with-ld=${LOCALBASE}/bin/ld \
108	${ICONV_CONFIGURE_ARG} \	110	${ICONV_CONFIGURE_ARG} \
109	--with-pkgversion="FreeBSD Ports Collection" \	111	--with-pkgversion="FreeBSD Ports Collection" \




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

Lines 1-5 Link Here

(-)b/lang/gcc12/Makefile (+2 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 12.2.0	2	PORTVERSION= 12.2.0
		3	PORTREVISION= 1
3	CATEGORIES= lang	4	CATEGORIES= lang
4	MASTER_SITES= GCC	5	MASTER_SITES= GCC
5	PKGNAMESUFFIX= ${SUFFIX}	6	PKGNAMESUFFIX= ${SUFFIX}
Lines 96-101 CONFIGURE_ARGS+=--disable-nls \ Link Here
96	--with-as=${LOCALBASE}/bin/as \	97	--with-as=${LOCALBASE}/bin/as \
97	--with-gmp=${LOCALBASE} \	98	--with-gmp=${LOCALBASE} \
98	--with-gxx-include-dir=${TARGLIB}/include/c++/ \	99	--with-gxx-include-dir=${TARGLIB}/include/c++/ \
		100	--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
99	--with-ld=${LOCALBASE}/bin/ld \	101	--with-ld=${LOCALBASE}/bin/ld \
100	${ICONV_CONFIGURE_ARG} \	102	${ICONV_CONFIGURE_ARG} \
101	--with-pkgversion="FreeBSD Ports Collection" \	103	--with-pkgversion="FreeBSD Ports Collection" \




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

Lines 1-5 Link Here

(-)b/lang/gcc13-devel/Makefile (+2 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 13.0.0.s20220731	2	PORTVERSION= 13.0.0.s20220731
		3	PORTREVISION= 1
3	CATEGORIES= lang	4	CATEGORIES= lang
4	MASTER_SITES= GCC/snapshots/${DIST_VERSION}	5	MASTER_SITES= GCC/snapshots/${DIST_VERSION}
5	PKGNAMESUFFIX= ${SUFFIX}-devel	6	PKGNAMESUFFIX= ${SUFFIX}-devel
Lines 105-110 CONFIGURE_ARGS+=--disable-nls \ Link Here
105	--with-as=${LOCALBASE}/bin/as \	106	--with-as=${LOCALBASE}/bin/as \
106	--with-gmp=${LOCALBASE} \	107	--with-gmp=${LOCALBASE} \
107	--with-gxx-include-dir=${TARGLIB}/include/c++/ \	108	--with-gxx-include-dir=${TARGLIB}/include/c++/ \
		109	--with-gxx-libcxx-include-dir=/usr/include/c++/v1 \
108	--with-ld=${LOCALBASE}/bin/ld \	110	--with-ld=${LOCALBASE}/bin/ld \
109	${ICONV_CONFIGURE_ARG} \	111	${ICONV_CONFIGURE_ARG} \
110	--with-pkgversion="FreeBSD Ports Collection" \	112	--with-pkgversion="FreeBSD Ports Collection" \




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

Return to bug 265962

Added Link Here

(-)b/lang/gcc11-devel/files/patch-libcxxrt (+18 lines)
1	libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
2	LLVM libc++abi without breaking backward compatibility. Besides, mixing
3	different C++ ABIs is not supported unless subset via DT_FILTER.
4
5	https://github.com/llvm/llvm-project/commit/35479ffb1251
6	https://github.com/freebsd/freebsd-src/commit/cf56074e5271
7
8	--- gcc/cp/g++spec.c.orig 2022-08-19 22:32:09 UTC
9	+++ gcc/cp/g++spec.c
10	@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see
11	#endif
12
13	#ifndef LIBCXXABI
14	-#define LIBCXXABI "c++abi"
15	+#define LIBCXXABI "cxxrt"
16	#endif
17	#ifndef LIBCXXABI_PROFILE
18	#define LIBCXXABI_PROFILE LIBCXXABI

Added Link Here

(-)b/lang/gcc11/files/patch-libcxxrt (+18 lines)
1	libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
2	LLVM libc++abi without breaking backward compatibility. Besides, mixing
3	different C++ ABIs is not supported unless subset via DT_FILTER.
4
5	https://github.com/llvm/llvm-project/commit/35479ffb1251
6	https://github.com/freebsd/freebsd-src/commit/cf56074e5271
7
8	--- gcc/cp/g++spec.c.orig 2022-04-21 07:58:53 UTC
9	+++ gcc/cp/g++spec.c
10	@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see
11	#endif
12
13	#ifndef LIBCXXABI
14	-#define LIBCXXABI "c++abi"
15	+#define LIBCXXABI "cxxrt"
16	#endif
17	#ifndef LIBCXXABI_PROFILE
18	#define LIBCXXABI_PROFILE LIBCXXABI

Added Link Here

(-)b/lang/gcc12-devel/files/patch-libcxxrt (+18 lines)
1	libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
2	LLVM libc++abi without breaking backward compatibility. Besides, mixing
3	different C++ ABIs is not supported unless subset via DT_FILTER.
4
5	https://github.com/llvm/llvm-project/commit/35479ffb1251
6	https://github.com/freebsd/freebsd-src/commit/cf56074e5271
7
8	--- gcc/cp/g++spec.cc.orig 2022-08-06 22:32:19 UTC
9	+++ gcc/cp/g++spec.cc
10	@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see
11	#endif
12
13	#ifndef LIBCXXABI
14	-#define LIBCXXABI "c++abi"
15	+#define LIBCXXABI "cxxrt"
16	#endif
17	#ifndef LIBCXXABI_PROFILE
18	#define LIBCXXABI_PROFILE LIBCXXABI

Added Link Here

(-)b/lang/gcc12/files/patch-libcxxrt (+18 lines)
1	libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
2	LLVM libc++abi without breaking backward compatibility. Besides, mixing
3	different C++ ABIs is not supported unless subset via DT_FILTER.
4
5	https://github.com/llvm/llvm-project/commit/35479ffb1251
6	https://github.com/freebsd/freebsd-src/commit/cf56074e5271
7
8	--- gcc/cp/g++spec.cc.orig 2022-08-19 08:09:52 UTC
9	+++ gcc/cp/g++spec.cc
10	@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see
11	#endif
12
13	#ifndef LIBCXXABI
14	-#define LIBCXXABI "c++abi"
15	+#define LIBCXXABI "cxxrt"
16	#endif
17	#ifndef LIBCXXABI_PROFILE
18	#define LIBCXXABI_PROFILE LIBCXXABI

Added Link Here

(-)b/lang/gcc13-devel/files/patch-libcxxrt (+18 lines)
1	libc++ on FreeBSD always uses PathScale libcxxrt and cannot change to
2	LLVM libc++abi without breaking backward compatibility. Besides, mixing
3	different C++ ABIs is not supported unless subset via DT_FILTER.
4
5	https://github.com/llvm/llvm-project/commit/35479ffb1251
6	https://github.com/freebsd/freebsd-src/commit/cf56074e5271
7
8	--- gcc/cp/g++spec.cc.orig 2022-07-31 22:32:16 UTC
9	+++ gcc/cp/g++spec.cc
10	@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see
11	#endif
12
13	#ifndef LIBCXXABI
14	-#define LIBCXXABI "c++abi"
15	+#define LIBCXXABI "cxxrt"
16	#endif
17	#ifndef LIBCXXABI_PROFILE
18	#define LIBCXXABI_PROFILE LIBCXXABI