From nobody Thu Aug 25 21:35:52 2022 X-Original-To: dev-commits-ports-main@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 4MDGVK0L9pz4ZZZm; Thu, 25 Aug 2022 21:35:53 +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 4MDGVJ5wQyz3r1M; Thu, 25 Aug 2022 21:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463352; 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=XATO/4RLXqhUGq1OupoJHkvA/PteBeQLDUSr4nwujVA=; b=gTrtmPWL6gIKBfz0DzWEf3og1BwUUhv8W8jNm2rhU555/60+8H5F92SesswUX7x5rwowL7 cG779AZ1uNz7+nw7yFnQ8AeJL3Hi3kCscN+kQKoNlVg98dj2nmd71gwRIJB6eiDnJMXbzS d7k+DW7AqzIRVde7cybwxzhJGSr3DYScEhafwCpCjIrGzJLODnhacnyeEd0DER1PZwzpSS 8o1qK9sXtxTQdxbdkr73JUPoNl7fQdcN/OZmrJxmSYqwEPp4b3uCI3DEqGp9cxbJsJdcn6 TY4BBxNRJ1sAW9NY5a6iP/aUJtE8IVcHsycSMB3XOuTa0GYY4yXXZL8en0hKYQ== 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 4MDGVJ52G3z13WV; Thu, 25 Aug 2022 21:35:52 +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 27PLZqAD085701; Thu, 25 Aug 2022 21:35:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PLZq16085700; Thu, 25 Aug 2022 21:35:52 GMT (envelope-from git) Date: Thu, 25 Aug 2022 21:35:52 GMT Message-Id: <202208252135.27PLZq16085700@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: 86e7abbbf467 - main - lang/gcc12: Expose non-default -stdlib=libc++ support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 86e7abbbf467e97ffa58363ca3327d08395931ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463352; 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=XATO/4RLXqhUGq1OupoJHkvA/PteBeQLDUSr4nwujVA=; b=cdMeXQ3q3HTp+EMWvWaxGWP1cPjZjR9JHpzQVUWCgO9/81x1ILJHOwtUVs5pdV7+FWfVDB XY0SjKqZPrnpeSQWCxIoDuV+pV9MWV0V65EIapgjN023tJ4h0q3/EqyhgVwDjUbW6PSDyu DZdKWy0xiPq9ZiX1X0zt4lJr0ZBCUS0WIGeXxuOjmd+ev68xLnTbHbU8YnyREllsWcyns9 EzxL/PeRb2yzY7gEIyUL3SAFWuxNOJbBWO9aDLtxX5sdPmrmFCH86WFFXaawY4YJi17owb nQbAx/MqUKU3OLEfT9ZmKDIH2r8nisYYbCtInKTZ234rAT0eue+UKAholJmKGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661463352; a=rsa-sha256; cv=none; b=h7h5nD8+B0wXFpprIcQ9x1ZydmbGLmeg2NvhhdxIAGAwWrd2M7p6kRoXFYMvk0TVBlUqET rQXSUc90/RTwhyw89jCt6ITSFSPS2k6LNYk904pNBAx23aDbFr+JFCoqS+NqcIfHx5pqs8 h4Azr1zts/v3Oy1CdSD2j/U0PiwywiDvQtO/8d7+2eXRCVvHO5W/zyPZSHqtMGG1Upv0tO w8ISCgcRG/ffnMhM6PbN1G6PG04LflAw5NMU8rYC/deEYiODgviLMF0L4W39BM98/b6zFD 7klIrVK5n5kBdpDGhEfkSl1wI5GlivTJKTw+1bqM01OpVJHXRoAgqdIFEDWrPg== 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=86e7abbbf467e97ffa58363ca3327d08395931ee commit 86e7abbbf467e97ffa58363ca3327d08395931ee Author: Jan Beich AuthorDate: 2022-08-20 16:06:02 +0000 Commit: Jan Beich CommitDate: 2022-08-25 21:35:37 +0000 lang/gcc12: 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/gcc12/Makefile | 2 ++ lang/gcc12/files/patch-libcxxrt | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index 0eacf66f3ee3..674e6524e43b 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -1,5 +1,6 @@ PORTNAME= gcc PORTVERSION= 12.2.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/gcc12/files/patch-libcxxrt b/lang/gcc12/files/patch-libcxxrt new file mode 100644 index 000000000000..beb02cbcc480 --- /dev/null +++ b/lang/gcc12/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-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