From nobody Sun Aug 21 10:15:27 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 4M9Wb42Tmsz4ZQbL; Sun, 21 Aug 2022 10:15:28 +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 4M9Wb41yz6z3pn8; Sun, 21 Aug 2022 10:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661076928; 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=ACufWIOeOSL9yo0YuRWds9sUR4YX3pYTN+opf1VS21k=; b=ennBcYWiQZmABMCETuMYaaeelj+QeEXyRFotHVY8dZOHp9o1OHftAdPM6tDpU7m9eWjOXC OcywwysONKgiBySYTBPyPg0HgJJyd1hVMsjwbVMIHU2lTgxwqJcP9IQhyrFlv8Iz5ThPFA tsh5ulXN7nqvILbeF045f8dvOHCYoDXARzsX0BcL+GkO1DgEecBLBwlOyIDgfjyi9p7ynN NaR3ENn8im0P9Gsget0D6JkxzWQJv4/g7Ap0ZV1PTIzgj1oBrSYBV8QNh9i48ad0zoX5JC oAlCtO3TfBVk2/8lOYW2KPQ/uSQPbEigvvsNIrdokUm3A/cYFItgF3NR7yL/2Q== 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 4M9Wb40sTJz16F4; Sun, 21 Aug 2022 10:15:28 +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 27LAFRG5005424; Sun, 21 Aug 2022 10:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LAFRup005423; Sun, 21 Aug 2022 10:15:27 GMT (envelope-from git) Date: Sun, 21 Aug 2022 10:15:27 GMT Message-Id: <202208211015.27LAFRup005423@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: 117c06cf3d56 - main - lang/gcc12-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: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 117c06cf3d5626ff5650342ed91c786759a6de1c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661076928; 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=ACufWIOeOSL9yo0YuRWds9sUR4YX3pYTN+opf1VS21k=; b=VKO5sAdJWuySnhmfqLpVZCIl2kwQlkFnJMdBMt95HWa/YeDTTrsnyQEpptBFLbdYutwfHW rQXjSH7ZMFhEy7XdXDqXoGZOXcaESFXmkNuip0tLZsrLhAG+qVNFQ0hsJB+s0gE/+frIks 8EndO9PfcjUwvOXHuJ5JKumMkuXhlF09cXpuqD1Zuq88vZT0ZRJ8dB3AkyCmjMi4uM55dk E6PEUjHvKJtxu3jZhXLWUOnko8O+SFC7qntPIKaYN9P0GJI8ZRGy7O/DzHvTliw7jAmvGB a4ZFsVbKB/u0AFrkmvOKKsWC685MDIWMt6smcMP7pX40UJoccTRWP/W4askTbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661076928; a=rsa-sha256; cv=none; b=mVIcib8/+/QFgQkSPDoUaJ6kCgoSHKhp/USLFCDo27ie09S93PNYYn2+lldy7GOXJd6kuQ 5O0gDXpfY42F0dq/1ZlzEVwNxZg1B8Dk36txTAOSume04Z56qr0n/2eES8VNS2vgrSzP8S FUcblreYbx+V2dqFKcw13HIlNnrKTPtu9J9UXnZwRPR5F5qWL/q23aBbhQYAx5ls29eOp5 0mE40GAIn2ALCmo328lYEWkp85xHlCbkqlP27Ll3r/HEg9/suVoJoS9vI86UD5F0L0Nbro nWGstqLrxJMF/YR6RryIkSWmBWRao/DwFLp29IYe/npwnNKLCVi5WW/ynyP2iw== 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=117c06cf3d5626ff5650342ed91c786759a6de1c commit 117c06cf3d5626ff5650342ed91c786759a6de1c Author: Jan Beich AuthorDate: 2022-08-20 23:26:46 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-08-21 10:14:23 +0000 lang/gcc12-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/gcc12-devel/Makefile | 1 + lang/gcc12-devel/files/patch-libcxxrt | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) 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+=--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-devel/files/patch-libcxxrt b/lang/gcc12-devel/files/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