From nobody Mon Aug 22 12:00:51 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 4MB9tC6j3Xz4ZSHD; Mon, 22 Aug 2022 12:00: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 4MB9tC6CpMz3trJ; Mon, 22 Aug 2022 12:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661169651; 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=gIYRHTf0Tew3V8YEQxPTRr3aoMX+DgiV7/g4Kc/Zp9c=; b=x2MSgdZjh+cqttmIAZ3cVC2nE21MqP6eTEvecWWCA3ZiIVXJZEMp7r4uui37wx6z45+G2X gT0nfZ58zVJVqnElqtv9HoukKRBEL/OydYadbC4CKa+AswaUohZpb8agjf4j1VW7X8AELL zOQcsn1gPIyYSHPW6vtnRx+vdJjDwPtmBiqpwXxE1fpLkabObgYQA3tHEFAxALQGuRigGH 7fJSsJfuZkcanAFEpWEAqzDFZOzuuDBlKxMY4zd3bZNOmtvACsbVR/YxOQY8uLGHCeKduA BQrfncPbr5D2fCXQEImdJQkdQT67qUnlsl0EuQeuQQark+UFE9rOGqdAhlK5ZA== 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 4MB9tC4yz4zpNc; Mon, 22 Aug 2022 12:00: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 27MC0pB5083381; Mon, 22 Aug 2022 12:00:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MC0pbV083362; Mon, 22 Aug 2022 12:00:51 GMT (envelope-from git) Date: Mon, 22 Aug 2022 12:00:51 GMT Message-Id: <202208221200.27MC0pbV083362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 4de701de115a - main - lang/gcc13-devel: 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: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4de701de115afbd0789dd5fd9e276423fc1df500 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661169651; 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=gIYRHTf0Tew3V8YEQxPTRr3aoMX+DgiV7/g4Kc/Zp9c=; b=c6DrxZQE9VVVed9AwUs7biF7QvAKWvsiMOvs1uFA2IKqwVQnasYLUjbO6cgVMANWiFBLQj FJJodaC0AL/1TOHYnxCan+2seuFSTmxMlLXo0ci/Mqv3CFFQeG1CPF4sfEgib+YY+yJhvG nQTuex1lE2Q8HuCbC9KpuADMkuWkv3+u5OCSLcLRvge5YAxhuJbB+tehydskxaJnt4GSvY qZvtHhM7bjdUVdhxTlTYRbgrkaz90KZJ6VT2I4PBVLKKdJb4pvw3scLUHZPcf4m/chxfKh h1u2UyfhdIvPLrMU3ArROC/K7XlgXrhqPdeWo/TTrXsLvngA+KjB1r0GkcE70Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661169651; a=rsa-sha256; cv=none; b=d6yJCJRavAsfnJGCuJs0MsjpQL3d0ua1Mr/yHaMRlrUMQ646ti1I8ooYID3jDopAhM29a6 Z1xpl2QYnXjFT9LKUAKrHScfWJd6zBz5VVZ63053UodWLXPyuApUIm7FiXXh6+w/hSWhV2 93ynpQFKTgNqocP0OGzwGok+MvbmHKe7r5WjQXfBsqzJ/ojASTDJZG5mBXU3KeTeo0QEc6 SZA+X5XAQEMxf4hAHpNXK4Ho3CEk2678BF0OGB2z4KrF8BEE/lnDLeKk7oBSzmClAEJb7Y kx9zMtiQo6e9PS1MzSG/VBcCn4w3vsdmwgSF9QzdnLL00wrHCY0BIBigc5mabg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=4de701de115afbd0789dd5fd9e276423fc1df500 commit 4de701de115afbd0789dd5fd9e276423fc1df500 Author: Jan Beich AuthorDate: 2022-08-21 23:25:49 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-08-22 12:00:04 +0000 lang/gcc13-devel: Expose non-default -stdlib=libc++ support Fix -stdlib=libc++ option which produced "error: unrecognized command-line option '-stdlib=libc++'". PR: 265962 Reported by: jbeich --- lang/gcc13-devel/Makefile | 2 ++ lang/gcc13-devel/files/patch-libcxxrt | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile index 053c31430d1d..7aa7c002e20e 100644 --- a/lang/gcc13-devel/Makefile +++ b/lang/gcc13-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= gcc PORTVERSION= 13.0.0.s20220731 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel @@ -105,6 +106,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/gcc13-devel/files/patch-libcxxrt b/lang/gcc13-devel/files/patch-libcxxrt new file mode 100644 index 000000000000..4225df7aad1e --- /dev/null +++ b/lang/gcc13-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-07-31 22:32:16 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