From nobody Sun Aug 21 10:23:07 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M9Wm416Rwz4ZR6T for ; Sun, 21 Aug 2022 10:23:16 +0000 (UTC) (envelope-from phascolarctos@protonmail.ch) Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M9Wm23rtHz3qw7; Sun, 21 Aug 2022 10:23:14 +0000 (UTC) (envelope-from phascolarctos@protonmail.ch) Date: Sun, 21 Aug 2022 10:23:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.ch; s=protonmail3; t=1661077392; x=1661336592; bh=dsN2aA/3wBxYjQCaDczYT0fSLdWLKyXFA3eYtb18kus=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=V1VmqoN2D8aBh3Q6k74sgiXz2yOvRsf33G7o18dLUEfT39zU7nWxDix/FMLOVgQDC cf5N1WwGESa4cxhvGwAwBMNCK47KVWN6BktNB2ShhBrVta1H+jNZv0+cFPGPKqBaix yzjUGoGePRg7hMa9lpLbRSD3W1x9Jcf9Z4opdBGmeD3RYT+fqkcuMtZ/oIjZTSMOJz inBk2LTGgIPnG19ZWNw72ErlIY3qaXl4v+dy/cW93GPM8KTjyfB9k2R5sSGB0KU/B5 bpkYbR6UeTEuGrOPSlTwFEtT7wJWF6oS4oV9LGPVLINXLQc2yZLwiKqG03Xzzyulad oSdem+kEmHKpA== To: Lorenzo Salvadore From: Lorenzo Salvadore Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Reply-To: Lorenzo Salvadore Subject: Re: git: 117c06cf3d56 - main - lang/gcc12-devel: Expose non-default -stdlib=libc++ support Message-ID: In-Reply-To: <202208211015.27LAFRup005423@gitrepo.freebsd.org> References: <202208211015.27LAFRup005423@gitrepo.freebsd.org> Feedback-ID: 8540510:user:proton List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4M9Wm23rtHz3qw7 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=protonmail.ch header.s=protonmail3 header.b=V1VmqoN2; dmarc=pass (policy=quarantine) header.from=protonmail.ch; spf=pass (mx1.freebsd.org: domain of phascolarctos@protonmail.ch designates 185.70.40.133 as permitted sender) smtp.mailfrom=phascolarctos@protonmail.ch X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-1.00)[-0.996]; DMARC_POLICY_ALLOW(-0.50)[protonmail.ch,quarantine]; R_SPF_ALLOW(-0.20)[+ip4:185.70.40.0/24]; R_DKIM_ALLOW(-0.20)[protonmail.ch:s=protonmail3]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-ports-all@FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; HAS_REPLYTO(0.00)[phascolarctos@protonmail.ch]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.40.0/24, country:CH]; REPLYTO_EQ_FROM(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[protonmail.ch:+]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N 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 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