From nobody Thu Sep 28 16:47:20 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 4RxKCD69BQz4v2Sq; Thu, 28 Sep 2023 16:47:20 +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 4RxKCD5hB9z4Zk8; Thu, 28 Sep 2023 16:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695919640; 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=xQw0DX8pqrWPZ9Wqph++iyT/StvrD1l2OlFZ6gSxpqg=; b=MN6RfHFTuOGO4EEQ21sNByOPGYh+4XEtuxtbicOvU9WugZafns7a2XjTHjNZFYqcr33LT1 M2rJJ6vFoI9PtMDXfeqUlC6sXgrUd4uFb6ky8l0UatbJ2NLxz1scfEgBQnnedABOw8Qu2Z NttcjqgpoHxro9+okWIuEzjrHWv+Ci6BFRnEakeBw/Fv+1iAObcptOawlyhAUwvukif2kf cmO3COMZEBbYL30xQ/xncJWS+xep6WDnXZ77bg83BkYGp21ORkRXiuzGmIsehzVS0xsJMQ epnNpMWYuZAyvXdwLwEJMW8Rham90yjKSSgWcDBegoqsOZiGsfWkQryyyVYO0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695919640; a=rsa-sha256; cv=none; b=r7I17HEGj1RLSWr0rB/seVQwMSj/lmz8LdS861sT5OsFJBEdWcCkwYT+khzSIgSz+XlOTc i2dTNtH0+ndD6ED3OBzZyL7XcVGsntwoXnrNRDAAQnK4k3Sn8y++A7oCr83j6FujVrAl2y Z/fyDf/Ma6uzjBXbvejYpE2GAiIQEqqH6THIctjhMnJo4D4FqtcFwxMK7Rui8DHw6Grvz8 GC1z+Eo8qVGnYqREYXbMBg5IWSIqlzrpL6fdEnJhovFfYdfspE21cgenCvkMLbwAhnCrf9 Pn8E02wFXQjpJEdJJKwCJirB5IYGTXoGQM8ysdVlZbKI4xU8Qsi1MNfRndtk7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695919640; 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=xQw0DX8pqrWPZ9Wqph++iyT/StvrD1l2OlFZ6gSxpqg=; b=j0WzzC1MQA1A+fFiqnprJ+fhezLgJBAvhmtAF1XBAnYrEhhfv6xZHWB0bxIW0/TwDO+fIN 0bDe7mD9CLRj/CHVR6nt0xS0sDeMYVk8Qptf2zz5VnNENKuo1RfczhdQOsIphPgGlUTX9W 0qkkdhyLreFcs78BOJphWlaQWvk7QlkjdeWttqcUNDGBcBrpgT0eETudIqSsR1aKLgbCqU A1xB0oNqZ+X269zu1IUO3QDXE9YsJf7YBwsXw1yIC2aFtaznJXZGG+NCT5N/iCr6Gg4uNe EXxbbm3TzcBJdhHeMj+DLGLHX1UA4k8YnAMW9LpQAKcWB8q2HSW7qAnTR5ns/w== 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 4RxKCD4jq7zVgM; Thu, 28 Sep 2023 16:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38SGlKZg006162; Thu, 28 Sep 2023 16:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SGlKrm006159; Thu, 28 Sep 2023 16:47:20 GMT (envelope-from git) Date: Thu, 28 Sep 2023 16:47:20 GMT Message-Id: <202309281647.38SGlKrm006159@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 6fd6fb3a9f51 - main - devel/freebsd-gcc12: fix build with libc++ 17 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fd6fb3a9f51ad97cef9d83d1e481b644fc7141d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fd6fb3a9f51ad97cef9d83d1e481b644fc7141d commit 6fd6fb3a9f51ad97cef9d83d1e481b644fc7141d Author: Dimitry Andric AuthorDate: 2023-09-21 19:08:52 +0000 Commit: Dimitry Andric CommitDate: 2023-09-28 16:46:47 +0000 devel/freebsd-gcc12: fix build with libc++ 17 When building relatively recent gcc ports (with C++ in them) against libc++ 17, you get errors similar to: In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/cp/module.cc:208: In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/system.h:239: In file included from /usr/include/c++/v1/vector:321: In file included from /usr/include/c++/v1/__format/formatter_bool.h:20: In file included from /usr/include/c++/v1/__format/formatter_integral.h:32: In file included from /usr/include/c++/v1/locale:202: /usr/include/c++/v1/__locale:546:5: error: '__abi_tag__' attribute only applies to structs, variables, functions, and namespaces 546 | _LIBCPP_INLINE_VISIBILITY | ^ /usr/include/c++/v1/__config:813:37: note: expanded from macro '_LIBCPP_INLINE_VISIBILITY' 813 | # define _LIBCPP_INLINE_VISIBILITY _LIBCPP_HIDE_FROM_ABI | ^ /usr/include/c++/v1/__config:792:26: note: expanded from macro '_LIBCPP_HIDE_FROM_ABI' 792 | __attribute__((__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_VERSIONED_IDENTIFIER)))) | ^ In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/cp/module.cc:208: In file included from /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/system.h:239: In file included from /usr/include/c++/v1/vector:321: In file included from /usr/include/c++/v1/__format/formatter_bool.h:20: In file included from /usr/include/c++/v1/__format/formatter_integral.h:32: In file included from /usr/include/c++/v1/locale:202: /usr/include/c++/v1/__locale:547:37: error: expected ';' at end of declaration list 547 | char_type toupper(char_type __c) const | ^ /usr/include/c++/v1/__locale:553:48: error: too many arguments provided to function-like macro invocation 553 | const char_type* toupper(char_type* __low, const char_type* __high) const | ^ /wrkdirs/usr/ports/lang/gcc12/work/gcc-12.2.0/gcc/../include/safe-ctype.h:146:9: note: macro 'toupper' defined here 146 | #define toupper(c) do_not_use_toupper_with_safe_ctype | ^ This is because gcc/system.h includes safe-ctype.h which redefines ctype macros such as toupper, tolower, etc to "poison" them. However, it should only include the safe-ctype.h header *after* any C++ headers, such as , , , etc, otherwise these might transitively include internal ctype headers (such as with libc++ 17), causing the above conflicts. This commit moves the safe-ctype.h inclusion to later in gcc/system.h, which solves this issue, and makes it possible to build against libc++ 17. PR: 274037 Approved by: jhb (maintainer) MFH: 2023Q3 --- devel/freebsd-gcc12/files/patch-gcc_system.h | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/devel/freebsd-gcc12/files/patch-gcc_system.h b/devel/freebsd-gcc12/files/patch-gcc_system.h new file mode 100644 index 000000000000..5322885b8b2e --- /dev/null +++ b/devel/freebsd-gcc12/files/patch-gcc_system.h @@ -0,0 +1,42 @@ +--- gcc/system.h.orig 2023-05-08 12:14:40 UTC ++++ gcc/system.h +@@ -203,19 +203,6 @@ extern int fprintf_unlocked (FILE *, const char *, ... + #endif + #endif + +-/* There are an extraordinary number of issues with . +- The last straw is that it varies with the locale. Use libiberty's +- replacement instead. */ +-#include "safe-ctype.h" +- +-#include +- +-#include +- +-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO +-extern int errno; +-#endif +- + #ifdef __cplusplus + #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY) + # include +@@ -243,6 +230,19 @@ extern int errno; + # include + # include + # include ++#endif ++ ++/* There are an extraordinary number of issues with . ++ The last straw is that it varies with the locale. Use libiberty's ++ replacement instead. */ ++#include "safe-ctype.h" ++ ++#include ++ ++#include ++ ++#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO ++extern int errno; + #endif + + /* Some of glibc's string inlines cause warnings. Plus we'd rather