From nobody Sat Sep 23 16:24:45 2023 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 4RtDxT3dxrz4tt5h; Sat, 23 Sep 2023 16:24:45 +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 4RtDxT3986z4RDY; Sat, 23 Sep 2023 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486285; 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=/6EeFL6Cn4antbjmt7SX+AMALIRd9A/llYThGJ4u3Ko=; b=dt7GTiziUPafL93cAv53eTR8MqIqdlznnGC2MGL7kOHP8Adfo3P2YxRlAA/vt29ZnTMg2M vXlDHY3geb1hEFDGCyip9guMuFarcugK68bmPCa3Aec54M1PPmTbZlLXOIrBTkiaCeD9Cw +hSlkQ9JXYUM7pGldkXrGogNwMR+0HOlUcojvw24BSM6yo4UaA7DtRduDuji52SGP26gWC X9KLgMMGWvj42UN++2FY8GJ8apkZnIwF+rnzFMKrpDb11oNHSjsqyU8LKMHJ6lqtAKl/5g 4zkji6aaGo+LqXvVArQilJHGAfZlt77uUhfIt1pzb83Wk2PM9izE/OdxjJ31zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695486285; a=rsa-sha256; cv=none; b=bUPScsRbIZCvgqt3YgOvkLuT7Oq33rLQ1xt0jhD3JGpDjCHNdW0TP69xiVL6C0iRy65PaU 9S25OtMF+oLqf7p8/a4Vf62bsYbEtPo62X9sWh2YkfeqAr6Gx4sTl87qkVVxqk8gfFX2Ht VGznSArhhUFVIApX2M+wMSqmwtK3SHIX7eyUyLoPXPq4ee6VFbQTpsft7/xHZ0L+K0WOxs u7Ni1SgaJUCZ1gqUGyFceg6j+/a4HVOa6f12C2GF/qCSB//flNts52vhbjmK6uiwAu1hSc hD3knqXutXMfkq+vyl9+QejeLYx9JKxKXMJqQGY/QTYubDuu8nK0cXVKIFE4VQ== 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=1695486285; 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=/6EeFL6Cn4antbjmt7SX+AMALIRd9A/llYThGJ4u3Ko=; b=okuPJyZd47iFyf58kbwt4Qn0+37+vZkIsb7WpZimyuf5AStd9OOjn4N71YVWoOF+t/ke2u LK/Z9Dd2lvdL7QeoVK9Qh6xeiPVUcF0TUBDXo789M3LJNFTVS/tB7cOUh4J+RJBvYMyWhV YS7HjFUmPXsPFLzXp5NdhL7kTKL8fOS+cmqLRACFbD4fV2SHAFMKG/GKGG13Dzp7vKuZSw JDwrPAoQHINmN2kTfNa2e2oRSc364Q6Brk4QSctmLOh97uQ8Wjy4RNMQIt1cAMNZVGWtWy O0juP2iIyNMqYcIW/PFAKmre+PT0P+gycgFZoKJ5FS9pn9ytaHmw3uddDZcx/g== 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 4RtDxT2D4tz19pS; Sat, 23 Sep 2023 16:24:45 +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 38NGOjme004221; Sat, 23 Sep 2023 16:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NGOjkD004218; Sat, 23 Sep 2023 16:24:45 GMT (envelope-from git) Date: Sat, 23 Sep 2023 16:24:45 GMT Message-Id: <202309231624.38NGOjkD004218@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: fef10a5f06e7 - main - lang/gcc6-aux: fix build with libc++ 17 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fef10a5f06e752b07282123abe59196618649cac Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=fef10a5f06e752b07282123abe59196618649cac commit fef10a5f06e752b07282123abe59196618649cac Author: Dimitry Andric AuthorDate: 2023-09-21 19:08:58 +0000 Commit: Dimitry Andric CommitDate: 2023-09-23 16:24:07 +0000 lang/gcc6-aux: 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: 274036 Approved by: fluffy (maintainer) MFH: 2023Q3 --- lang/gcc6-aux/files/patch-gcc_system.h | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/lang/gcc6-aux/files/patch-gcc_system.h b/lang/gcc6-aux/files/patch-gcc_system.h new file mode 100644 index 000000000000..5321e3814c0f --- /dev/null +++ b/lang/gcc6-aux/files/patch-gcc_system.h @@ -0,0 +1,42 @@ +--- gcc/system.h.orig 2016-04-22 11:09:22 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 +@@ -235,6 +222,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