From nobody Sat Aug 05 18:02:18 2023 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 4RJ9Qh3tdhz4mM91; Sat, 5 Aug 2023 18:02:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJ9Qh3JPrz4T7k; Sat, 5 Aug 2023 18:02:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691258540; 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: in-reply-to:in-reply-to:references:references; bh=D/f4MngmR7zADxDcJWQKqDVSdRIxpLLJspGoUPTYMhE=; b=Nequ5LClovVJRs4fIgOhnm7lA/fK50JkQDERCcbDunwyNb79rPFwjtm0uvuliZPkP5t7+U ct1+NgxmCnnGXDfFkc7HCfCZBa5oT+hp5d53J0s29TfSvDfWuAwih1oM0FnvvshkUUnQnC pEbcFN1IRwjcnGORNT2iRs8837a5EWfU59wOBf33wc5kFefMB+ti/bJ4C/AL47vbjRMqug dyuT5cpIWyadX8xBOFwt2N4SHRCx2OeLvAC7QT6LxmlVay2yME0yhZh/aDvjsMfouEQKR8 Y/iEBOh85/NSG8FfAuHojNNLz9jdzYI+YzQhqLJgkHYgXmZrmIyxql8AN1wy+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691258540; 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: in-reply-to:in-reply-to:references:references; bh=D/f4MngmR7zADxDcJWQKqDVSdRIxpLLJspGoUPTYMhE=; b=Qf6TOLPNQubMNpvPK7JNXgzMJaFYKBCA0W5XxRWrPxyYtcITqpuZ0lYU4jnANJ5Lwp9VRf jjPj+xeiAFbydXGtdMdOJWzBrzEOk1ilZnf2vAWzZWj+dl88PMHji/QfbNWn440JouZ9r0 XhgtpiHADyNwtP1RSPZJwtHIaCx6JZ1ksf5NZ4N6FAcEaYN1n4o3E8uCrZd2biYQOxaUCj qOJv0w2ohKO/w0QPaJCU7jK2STbmhAy659QCfWqIgWA8PmxRHwU9HWe+R+B6htVUyTgecA wzMW+68PRQCNatN023CoeeQoFWtePYihRdOD/qtyZMk3gTOFSQF4rwBZWGo/bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691258540; a=rsa-sha256; cv=none; b=CMKL+wgTT6hWmSQnkoa5NS+vOL72DmxEFpofpw6iGL/f9bBQsfW24RvLVfQDhY3yoUMHxI VKQnuB04xfeFG/JRH2ih1JPyjWIv7uwD3WA03XPh7dRtr1hcCLgO+mEJU0jiK0/n4jxD41 aIzlJK22lcu1FBlaOgxkxdY93QXIC4ceT2+egOU5w8ckSQv0BMhfr8+Im4YbKx0cW2ODEN U8sWEZLexsuf/jZgbjjIs4amSJuUx7VTdZ8qcnpZpMA1yhKkaGsoAH6PDv/yEGx/PtRrJY +ob/FobQdHvLG95qzET3goGb6M/DR1jNCQHcZGoyGlURrhFtWFmn4IP2xQ4teQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:8581:c9b4:3225:b671] (unknown [IPv6:2601:648:8683:a9e0:8581:c9b4:3225:b671]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RJ9Qg6Llnz1XRF; Sat, 5 Aug 2023 18:02:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <3c0d9f6d-eb2b-741f-c719-7565c8d00450@FreeBSD.org> Date: Sat, 5 Aug 2023 11:02:18 -0700 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: e858e20eec81 - main - devel/freebsd-gcc12: Use -stdlib=libc++ to use libc++. Content-Language: en-US To: Matthias Andree , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202308051524.375FObmR026375@gitrepo.freebsd.org> <18d7e6c0-7163-8b96-aec7-675592e9fb55@FreeBSD.org> From: John Baldwin In-Reply-To: <18d7e6c0-7163-8b96-aec7-675592e9fb55@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/5/23 8:34 AM, Matthias Andree wrote: > Am 05.08.23 um 17:24 schrieb John Baldwin: >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=e858e20eec8104648b25313b388e9f2532c980fb >> >> commit e858e20eec8104648b25313b388e9f2532c980fb >> Author: John Baldwin >> AuthorDate: 2023-08-05 15:24:11 +0000 >> Commit: John Baldwin >> CommitDate: 2023-08-05 15:24:11 +0000 >> >> devel/freebsd-gcc12: Use -stdlib=libc++ to use libc++. >> >> Instead of overriding the path and library name of libstdc++, set the >> path for libc++ and change the default of -stdlib= from libstdc++ to >> libc++. >> --- >> devel/freebsd-gcc12/Makefile | 8 ++++---- >> devel/freebsd-gcc12/files/patch-gcc-configure | 13 ------------- >> devel/freebsd-gcc12/files/patch-gcc_c-family_c.opt | 11 +++++++++++ >> devel/freebsd-gcc12/files/patch-gcc_cp_g++spec.cc | 11 +++++++++++ >> 4 files changed, 26 insertions(+), 17 deletions(-) >> >> diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile >> index 677f60f8c5dd..e6ac2069852a 100644 >> --- a/devel/freebsd-gcc12/Makefile >> +++ b/devel/freebsd-gcc12/Makefile >> @@ -1,6 +1,6 @@ >> PORTNAME= gcc >> PORTVERSION= 12.2.0 >> -PORTREVISION= 8 >> +PORTREVISION= 9 >> CATEGORIES= devel >> MASTER_SITES= GCC >> PKGNAMEPREFIX= ${TARGETARCH}- >> @@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ >> --with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \ >> --with-system-zlib \ >> --without-zstd \ >> - --with-gxx-include-dir=/usr/include/c++/v1/ \ >> + --with-gxx-libcxx-include-dir=//usr/include/c++/v1 \ > > Are the double leading slashes intentional/necessary/harmless? Necessary due to the use of --with-sysroot=/ to enable use of --sysroot (used during buildworld/buildkernel). The configure script removes the sysroot from the include dir if it is a prefix. Without the double slashes this resulted in "usr/include/c++1/v1" as the path. However, that meant that when buildworld later used --sysroot ${WORLDTMP} that the compiler would not honor the --sysroot for C++ headers (since it only honors sysroot for include paths with a leading /). Without passing '--with-sysroot=/', GCC doesn't support --sysroot at all which buildworld/buildkernel require. -- John Baldwin