From nobody Thu Aug 25 21:35:50 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 4MDGVG4R83z4ZZcQ; Thu, 25 Aug 2022 21:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MDGVG3w5kz3rDY; Thu, 25 Aug 2022 21:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4dCh++OAp9OUgZD96ad1vwtDjV6zeQCihRsrl6eL1o=; b=m8Zj0KBddTLnrGXR83s+/G6kiCYbAbAr7MHx2zcE2gz0auIpVtERNUS35/UiqrZRmpCDJi t2gYMw6NGAQOLODsAE4PZsYFrXuvFYdf7HKownyuK4G0ES9pUjlTu/l131m9jcN8+ulRY6 7SDP6K3RE2fZCTLj1ZckGcvUpEH8u0K7zupKawhynTuSCKF/t0l/Xn0uW0vvEcSr0XWAbc f7bfWmbbhSYgW3g14xcm91bXOriZAq12EXDmsrOo6AozNj2CIWVrbr6VpzF03SmikXAm8y YHdb325Id23g6eTOD2ETppdHMHupKdmIT0NEix/DKnQRA4Cz1DxgVxqYDIAnYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MDGVG2ydmz12xf; Thu, 25 Aug 2022 21:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PLZouF085646; Thu, 25 Aug 2022 21:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PLZoXJ085645; Thu, 25 Aug 2022 21:35:50 GMT (envelope-from git) Date: Thu, 25 Aug 2022 21:35:50 GMT Message-Id: <202208252135.27PLZoXJ085645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: e6e0bd06a2ee - main - lang/gcc11-devel: Expose non-default -stdlib=libc++ support 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: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6e0bd06a2eec3f9f5e2780869ce3682d6c81391 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4dCh++OAp9OUgZD96ad1vwtDjV6zeQCihRsrl6eL1o=; b=GfLacKdNwQnbdl+yX5sUdOd1wUuU4R3gQ/6rrXrpuBMizmtPSv2I6vQ3RLp0fdxJZmAGyG 2pxYMWneof8q8/eXjYg1U+Dy3INP9IGPeIF6Esd8EGd+QPAD8B7kAg8oZWCZdyTs4NEl5T 8zgklcz3fRGvPR68VTZY4euHyYcQ6MpKzqrvtdolsgqA3nGL7M3FF1Vu87QP9xvowT+nvK A4wb9TeTf3XEOR1XDMYJ9ohEk/zNUBnRaWNDSodsVw2wnowOOH+oOzZOzxF+0Xr2DrhRAQ pPLvaA5xCDJyCC0Ge9HjSjv7PwOEuReFgpjxj38aaP7Y9nH0viFdxQY8aExBVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661463350; a=rsa-sha256; cv=none; b=MrQ4Qlqd5CJB9Z5E1yO+Xk2xtA3CSxW00GPpgaf+3TI3nsE6DxFGIDJs12DrA2z+IEpSow +11rbiiEWHlVZK3qyIouV6KAl5bYMhm0ll4slm2r7tyT/975nVVMQzYpPk2oPQjWfoa4Xw deP/+riOMAaz5ujzM1kGwiXldh72BkWHwp8ojp5AREocXFp+CcyMSfG3mhlIbgIlxeEqP0 X2RwaCMiLtR2N0YRnKwMxYrp1/7HphmfBVKarbf/8PoPhmd0GMz8W+DDwrPraM0HnC+gZ0 v0mdLobUTUKMWv8SlwoIMPRBO4nm0sDLIxkVajKtVAlVugNxF44qGaWR5w1Keg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6e0bd06a2eec3f9f5e2780869ce3682d6c81391 commit e6e0bd06a2eec3f9f5e2780869ce3682d6c81391 Author: Jan Beich AuthorDate: 2022-08-20 16:06:02 +0000 Commit: Jan Beich CommitDate: 2022-08-25 21:35:37 +0000 lang/gcc11-devel: Expose non-default -stdlib=libc++ support Fix -stdlib=libc++ option which produced "error: unrecognized command-line option '-stdlib=libc++'". PR: 265962 Approved by: salvadore (maintainer) Exp-run by: antoine (via bug 265964) --- lang/gcc11-devel/Makefile | 2 ++ lang/gcc11-devel/files/patch-libcxxrt | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) 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