From nobody Sat Sep 23 20:46:22 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 4RtLlL5qy5z4vD44; Sat, 23 Sep 2023 20:46:22 +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 4RtLlL4v07z3Qbj; Sat, 23 Sep 2023 20:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695501982; 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=FhhQgQ1rYF6wabfqCO9ftvHr8VZmnuPwj9EcbUsY+Dk=; b=ijIRR0goEyiqxmV+4VnhjIEILy+waMBHuf/0yMzHP86yefqurbS29raN4JZoAymCWyjPWN LxRWznJQBIWKBlB5rbXmt012oxKqRG1dXTDxUcBuhEZ1mJV931NCc2ZRzDWR26LAmho/hC arNE2mKvh8R338ey3il90VMqhQsbkommVMHkQ8XJekLVp1GasSHYybQXPNOJiHOJqutOkB a6zBpjDCZMIscnkyvJBHqoT+QbX4EDGv43Ij7JSDJEPLhQk8H9xhC67dcO5N36UCshkmD3 TwOqkAeZDv+17TdFokAbOQr4YTtTzkMbUgMCNx7S2pFRLycd9+q2q7eEQyhIvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695501982; a=rsa-sha256; cv=none; b=NDnY3t0D+B88XxeSqLFHpwZyshxBtPz8q6djxTsxlCnQbQif9h89w9Zo53752UhTPoPsda SilT2IQ7a8IfT6jeJDhUvCmqcWj3b4kDdF1ntrSocZhUX0ca+WvcRAugSNbhWcfTMUq+Z7 2JbQrcVLfDj475KXWhTAS4opeJLqqjGqW0qOPRqdZUcgd8BpNNxLlPraSEuywGhhqpj17U JmCFMz6d0fqdOiBjsWlxjgWyD93ykYsbwaF6vGEi++J5BhaNmBpIy1hrcMhczv6pD5RoKZ uoT+Vzobuma56zXiKeGZBEjjH2Uhj17z8TVGHnO1/yvvhCmsa1jJ9sdz6yPAqQ== 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=1695501982; 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=FhhQgQ1rYF6wabfqCO9ftvHr8VZmnuPwj9EcbUsY+Dk=; b=ZVhvzN9Qv2EdUjklEhXkC9OwKdXBPYCbME94dduZ6jjdPIGa0B4tTwWURD/HqTKQOoa3Vb UyjOi7tEADmatwOmixSNAjp5mFdS1kXVeBZuVNFLVrSuE1DiZYRsGSR/yLBuUKixEU4kSg Pk8rx72khnMvRFc5o7plrSm/2rJr01ezngpn2EXGtOB27Fq2iTe0IbGxXOcgzcYRjSOVZF Fljf4Got3wxO755Vy1BRir894PODjg3pfd2m7piFwILHdBJTQTQG7v/1cqyV/5xVgDJgsy Wy1WNH5/dW8xwDvJpzV+L2bghkGxIKO/dc/61NgNCYALRC9etYYS8D4gYN/+SQ== 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 4RtLlL3xw9z3wY; Sat, 23 Sep 2023 20:46:22 +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 38NKkMNM036687; Sat, 23 Sep 2023 20:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NKkMEH036684; Sat, 23 Sep 2023 20:46:22 GMT (envelope-from git) Date: Sat, 23 Sep 2023 20:46:22 GMT Message-Id: <202309232046.38NKkMEH036684@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joerg Wunsch Subject: git: 6275155b90de - main - devel/avr-gcc: 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: joerg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6275155b90de11398a1d105b053732313e7c1e7a Auto-Submitted: auto-generated The branch main has been updated by joerg: URL: https://cgit.FreeBSD.org/ports/commit/?id=6275155b90de11398a1d105b053732313e7c1e7a commit 6275155b90de11398a1d105b053732313e7c1e7a Author: Joerg Wunsch AuthorDate: 2023-09-23 20:43:27 +0000 Commit: Joerg Wunsch CommitDate: 2023-09-23 20:46:17 +0000 devel/avr-gcc: Fix build with libc++ 17 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 compilation errors. PR: 274038 Reported by: dim --- devel/avr-gcc/Makefile | 2 +- devel/avr-gcc/files/patch-gcc_system.h | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index 61fe35a14226..bb11c44a37bd 100644 --- a/devel/avr-gcc/Makefile +++ b/devel/avr-gcc/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GCC PKGNAMEPREFIX= avr- diff --git a/devel/avr-gcc/files/patch-gcc_system.h b/devel/avr-gcc/files/patch-gcc_system.h new file mode 100644 index 000000000000..4cb52e33f571 --- /dev/null +++ b/devel/avr-gcc/files/patch-gcc_system.h @@ -0,0 +1,42 @@ +--- gcc/system.h.orig 2021-07-28 06:55:07 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 +@@ -242,6 +229,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