Date: Sun, 21 Aug 2022 10:23:07 +0000 From: Lorenzo Salvadore <phascolarctos@protonmail.ch> To: Lorenzo Salvadore <salvadore@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 117c06cf3d56 - main - lang/gcc12-devel: Expose non-default -stdlib=libc++ support Message-ID: <SNeylmWggsQko3d0lbgR7Kx-Hc7O1CnrMosLUeoQPQK0bGBrwO5F1r1adbDnaPRYwVyOSHEsAaIjblkAZ_2KG27Iq6bzIEDChX8a5QPyNHc=@protonmail.ch> In-Reply-To: <202208211015.27LAFRup005423@gitrepo.freebsd.org> References: <202208211015.27LAFRup005423@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In the commit below I forgot the port revision bump (which was correctly sp= ecified in the submitted patch). In this case it is not a big deal as the port is upda= ted anyway to a new version with the next commit (4dcf6bf2b23a8b25ae519b135045cdab2901= 31b3), but I will be more careful when updating the other gcc ports, especially when I= do not commit the patch together with a version update. Lorenzo Salvadore ------- Original Message ------- On Sunday, August 21st, 2022 at 12:15, Lorenzo Salvadore <salvadore@FreeBSD= .org> wrote: >=20 >=20 > The branch main has been updated by salvadore: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D117c06cf3d5626ff5650342e= d91c786759a6de1c >=20 > commit 117c06cf3d5626ff5650342ed91c786759a6de1c > Author: Jan Beich jbeich@FreeBSD.org >=20 > AuthorDate: 2022-08-20 23:26:46 +0000 > Commit: Lorenzo Salvadore salvadore@FreeBSD.org >=20 > CommitDate: 2022-08-21 10:14:23 +0000 >=20 > lang/gcc12-devel: Expose non-default -stdlib=3Dlibc++ support >=20 > Fix -stdlib=3Dlibc++ option which produced "error: unrecognized > command-line option '-stdlib=3Dlibc++'". >=20 > PR: 265962 > Reported by: jbeich > --- > lang/gcc12-devel/Makefile | 1 + > lang/gcc12-devel/files/patch-libcxxrt | 18 ++++++++++++++++++ > 2 files changed, 19 insertions(+) >=20 > diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile > index 96d5af78e537..29a7a52ebfc0 100644 > --- a/lang/gcc12-devel/Makefile > +++ b/lang/gcc12-devel/Makefile > @@ -104,6 +104,7 @@ CONFIGURE_ARGS+=3D--disable-nls \ > --with-as=3D${LOCALBASE}/bin/as \ > --with-gmp=3D${LOCALBASE} \ > --with-gxx-include-dir=3D${TARGLIB}/include/c++/ \ > + --with-gxx-libcxx-include-dir=3D/usr/include/c++/v1 \ > --with-ld=3D${LOCALBASE}/bin/ld \ > ${ICONV_CONFIGURE_ARG} \ > --with-pkgversion=3D"FreeBSD Ports Collection" \ > diff --git a/lang/gcc12-devel/files/patch-libcxxrt b/lang/gcc12-devel/fil= es/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?SNeylmWggsQko3d0lbgR7Kx-Hc7O1CnrMosLUeoQPQK0bGBrwO5F1r1adbDnaPRYwVyOSHEsAaIjblkAZ_2KG27Iq6bzIEDChX8a5QPyNHc=>