From nobody Thu Aug 25 21:35:51 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 4MDGVH5fyhz4ZZZj; Thu, 25 Aug 2022 21:35:51 +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 4MDGVH5DZ3z3r8Q; Thu, 25 Aug 2022 21:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463351; 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=YNocM9BURZddKSO0dxaMO7fOVfv/EoZtn/PSqJFzICY=; b=xLQkxahuGJQH5jtfv/3RqmMHPv46Mmyj+fXFM3bWAjIo+oa9bYB1ljtoNEW/lGRR8USTM2 12wjL/Cl5G47MV9EQIy7ktK2XP0WFHfGtYtRTd/U7NbXMjwwOwTwdFemeyx/U43GlBaA1b z+zGccQK/iAlyceyhB5pnlHFjoIYIVThtk3z5RSZRklKHfYLdzQ+howfIa1WxBNngxl0fi 9xrlUZzzDHuCJvcuwnsLs1LVgQka/0QU3gcua7ixDmosrrXlZL+KIljpYjBfAkE0sxFypd +nH/1/KTr4PjU8wfCM2Iv1jC3FOkBu6Q2DexbRS1C4CtCpvWZrBRPS2NORnQmg== 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 4MDGVH4J4Bz12lk; Thu, 25 Aug 2022 21:35:51 +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 27PLZph1085675; Thu, 25 Aug 2022 21:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PLZpkS085674; Thu, 25 Aug 2022 21:35:51 GMT (envelope-from git) Date: Thu, 25 Aug 2022 21:35:51 GMT Message-Id: <202208252135.27PLZpkS085674@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: 65fe81d73e72 - main - lang/gcc11: 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: 65fe81d73e72f1303557c9809a73716cc7fcd77b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463351; 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=YNocM9BURZddKSO0dxaMO7fOVfv/EoZtn/PSqJFzICY=; b=TOYDWTRPaqqc3macj7oTIjQE/jISrZiY0/RRXlH1qQAde5JfV5QjZIEdAD8XRqylFYX9Vz u4/7GrP2tsXKRM5Iho5Vm3VRmvpp18pM7RZYl0itazL5HUtAS0lRcnY37DvRS713bJUtGU 9oDKNbL81EeLJhxXIn1XGPvUwwWdvtrhHcCLZhD2lZXGNeh3ER0SH3Ycn1bMjlaV9iUecO /PES4iCIuALKtPFBRPqa7jnxRlsPOnLzBXXeCXLH0z9HRk6kzFFmOBCSLbqY3iKBXmFpTx Y9RWRmvzsHA5S3QpaNGZ1eXKr3bxoHw6ASz1Lc+xBq3qolBGWAsapo0Rmd7BOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661463351; a=rsa-sha256; cv=none; b=c7HF+D04JBHhsuXmheYsXiJy+w0nht4mDObufg0gBM4pUWaR9dvnKPhc1UL4HdRTXjWBT4 GQaBOzdzvID311xLgm9bTUup3pnDrdUNdo+yL04Ntf8ncZk3JvDIh8s+Y2W+eKTKDxrzkG l8lZaU0f2FQw31y2/+TYUkAHi5hoUy7a6U9ByezRG/OER3E5EoNgsbkSCKaTCbn3WIjx/y bxjNu1tj/gNMaYIympirn6tV4AXWC0fZlipyWkm2avix0OHFTacbXEhzMP699m2+8hmCNp wm7iUUht86VrwpTHiKTmMN5flpvCaOtFV7rffwTYB0Kiv4o0FRGqV92pjyv8Qg== 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=65fe81d73e72f1303557c9809a73716cc7fcd77b commit 65fe81d73e72f1303557c9809a73716cc7fcd77b Author: Jan Beich AuthorDate: 2022-08-20 16:06:02 +0000 Commit: Jan Beich CommitDate: 2022-08-25 21:35:37 +0000 lang/gcc11: 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/Makefile | 2 ++ lang/gcc11/files/patch-libcxxrt | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile index bf886a68e040..cf03da83347a 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