From nobody Fri Dec 15 20:37:50 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 4SsLdB58m9z543Pj; Fri, 15 Dec 2023 20:37:50 +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 4SsLdB4fM6z3Xn3; Fri, 15 Dec 2023 20:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702672670; 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=A/mf3uyLqu+4KFdzRAXxCkJI/c8D3qk2bUTUH+1OVEs=; b=Gi7oaNEmPNRTKu0EgbB+WwwxHe/fiQpUKF8r4blva1rC/W91afjyF87mP6W+qSG62m1WOW QbDB0nhNHhsIivyeK84wZmdEqGIDTNXp72YO5lQ0MDAAEg/iIpb9wCQ3yXug2o2SNgW7Y8 79hewtiAoHOwu589UIRKulpSiIBlfkfciPz6egreJJb/ZDFWo1oFFf1sAvNvg/f5Ds6nH5 DD+XDkl9FCmrI/e+jwHQWeUbEVl0MOIQuf193KXrYPMdk5Juk9y19MFSgc8PvsbtqdQefZ 7U3cAtGzc+HBU/FgGFutmi4oswd6MIXfDbj45d9ZbyYeGzHGRTgnVij2wFa1Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702672670; a=rsa-sha256; cv=none; b=dvJBaFk6FNYNfIWjZv3lsHuEkBeySEBWETQZVGIDEBgexc1l2ujhYOd9SfKNO1qOfHbvg+ F3cmRLRW1tnXlVTykV6qjLjR9v940POzzCq9oVbjFwAkHQNL/4yHAWdX83W2K/dBjnHDkx wlyI1bxWmDEFmjGwBG6IDkplEmqfH1yW+x5vWyZzZI0h59BJrAAzoI1/SykUBHi0kP+OOO fh6v+H1WGtOD5EG1wQSHZ6pHgZdxoq5xfYhZ3xP9H26Qvxj+oHv4uzw+tMl0raAszYqc3g ZyKMa8DcMwBmXcx6ncHZ34uio3wPxd1dMzg4QuzGUtAjWQvAavaLP1uMuidtaA== 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=1702672670; 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=A/mf3uyLqu+4KFdzRAXxCkJI/c8D3qk2bUTUH+1OVEs=; b=tfEsHQcM6NuJyHyg2vEwzVaG3mCKdqxNMzQK3caWTYK2gn1oDQGGfR+fi7DNXvsns4EfXI KElMPa/D5CJwOdRIFzmOoXk6ccgHdS1cVlarP/NjgjymCWA0LTwqC4vsZ0qZAA4qp7tMAE sZaFvSy7AQ/QK5/FAj3l+o7hrK7SZokPK+6pq0+VAN+5we4ce7dlQnQ0Feba3HR2FwzaDa KDypVpSduF+e30YYwUR99OLJUkMwsNRXkdkVSuQG3AMlfTZPp8+DEyz7BycGt9w2yKAVxr J1jucO+nPSaxQABiewGlQLt5IBEErT3D0wigL+vY/6urVLfIXY2NNUNGYfHNwQ== 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 4SsLdB3j4lzB0P; Fri, 15 Dec 2023 20:37:50 +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 3BFKbo3R086186; Fri, 15 Dec 2023 20:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFKboIP086183; Fri, 15 Dec 2023 20:37:50 GMT (envelope-from git) Date: Fri, 15 Dec 2023 20:37:50 GMT Message-Id: <202312152037.3BFKboIP086183@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: a4831f4933d0 - main - lang/gcc12 lang/gcc12-devel lang/gcc13 lang/gcc13-devel lang/gcc14-devel: fix build without bootstrap 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: a4831f4933d006071d96a861506ff0db44d1d3ac Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4831f4933d006071d96a861506ff0db44d1d3ac commit a4831f4933d006071d96a861506ff0db44d1d3ac Author: Dimitry Andric AuthorDate: 2023-12-13 15:22:46 +0000 Commit: Dimitry Andric CommitDate: 2023-12-15 20:36:59 +0000 lang/gcc12 lang/gcc12-devel lang/gcc13 lang/gcc13-devel lang/gcc14-devel: fix build without bootstrap When more recent gcc ports are built without bootstrap, compiling libcc1 plugins results in errors similar to: In file included from /wrkdirs/share/dim/ports/lang/gcc13/work/gcc-13.2.0/libcc1/libcc1plugin.cc:72: 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: /usr/include/c++/v1/locale:289:36: error: attempt to use a poisoned identifier 289 | __status = (unsigned char*)malloc(__nkw); | ^ /usr/include/c++/v1/locale:1584:28: error: attempt to use a poisoned identifier 1584 | __ob = (char_type*)malloc(2*static_cast(__nc)*sizeof(char_type)); | ^ This is because gcc's own system.h header poisons these identifiers, and the libcc1 plugins include after that. (Note that libstdc++ is not affected because they seem to have implicitly included already at that point.) Fix it by telling system.h to include at the correct place, and removing the explicit includes from libcc1plugin.cc and libcp1plugin.cc. PR: 275748 MFH: 2023Q4 --- lang/gcc12-devel/files/patch-libcc1_libcc1plugin.cc | 19 +++++++++++++++++++ lang/gcc12-devel/files/patch-libcc1_libcp1plugin.cc | 19 +++++++++++++++++++ lang/gcc12/files/patch-libcc1_libcc1plugin.cc | 19 +++++++++++++++++++ lang/gcc12/files/patch-libcc1_libcp1plugin.cc | 19 +++++++++++++++++++ lang/gcc13-devel/files/patch-libcc1_libcc1plugin.cc | 19 +++++++++++++++++++ lang/gcc13-devel/files/patch-libcc1_libcp1plugin.cc | 19 +++++++++++++++++++ lang/gcc13/files/patch-libcc1_libcc1plugin.cc | 19 +++++++++++++++++++ lang/gcc13/files/patch-libcc1_libcp1plugin.cc | 19 +++++++++++++++++++ lang/gcc14-devel/files/patch-libcc1_libcc1plugin.cc | 19 +++++++++++++++++++ lang/gcc14-devel/files/patch-libcc1_libcp1plugin.cc | 19 +++++++++++++++++++ 10 files changed, 190 insertions(+) diff --git a/lang/gcc12-devel/files/patch-libcc1_libcc1plugin.cc b/lang/gcc12-devel/files/patch-libcc1_libcc1plugin.cc new file mode 100644 index 000000000000..d54adddb021b --- /dev/null +++ b/lang/gcc12-devel/files/patch-libcc1_libcc1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcc1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -68,8 +69,6 @@ + #include "rpc.hh" + #include "gcc-c-interface.h" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc12-devel/files/patch-libcc1_libcp1plugin.cc b/lang/gcc12-devel/files/patch-libcc1_libcp1plugin.cc new file mode 100644 index 000000000000..0f3d2d161404 --- /dev/null +++ b/lang/gcc12-devel/files/patch-libcc1_libcp1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcp1plugin.cc +@@ -33,6 +33,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -70,8 +71,6 @@ + #include "marshall-cp.hh" + #include "rpc.hh" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc12/files/patch-libcc1_libcc1plugin.cc b/lang/gcc12/files/patch-libcc1_libcc1plugin.cc new file mode 100644 index 000000000000..d54adddb021b --- /dev/null +++ b/lang/gcc12/files/patch-libcc1_libcc1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcc1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -68,8 +69,6 @@ + #include "rpc.hh" + #include "gcc-c-interface.h" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc12/files/patch-libcc1_libcp1plugin.cc b/lang/gcc12/files/patch-libcc1_libcp1plugin.cc new file mode 100644 index 000000000000..0f3d2d161404 --- /dev/null +++ b/lang/gcc12/files/patch-libcc1_libcp1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcp1plugin.cc +@@ -33,6 +33,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -70,8 +71,6 @@ + #include "marshall-cp.hh" + #include "rpc.hh" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc13-devel/files/patch-libcc1_libcc1plugin.cc b/lang/gcc13-devel/files/patch-libcc1_libcc1plugin.cc new file mode 100644 index 000000000000..d54adddb021b --- /dev/null +++ b/lang/gcc13-devel/files/patch-libcc1_libcc1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcc1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -68,8 +69,6 @@ + #include "rpc.hh" + #include "gcc-c-interface.h" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc13-devel/files/patch-libcc1_libcp1plugin.cc b/lang/gcc13-devel/files/patch-libcc1_libcp1plugin.cc new file mode 100644 index 000000000000..0f3d2d161404 --- /dev/null +++ b/lang/gcc13-devel/files/patch-libcc1_libcp1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcp1plugin.cc +@@ -33,6 +33,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -70,8 +71,6 @@ + #include "marshall-cp.hh" + #include "rpc.hh" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc13/files/patch-libcc1_libcc1plugin.cc b/lang/gcc13/files/patch-libcc1_libcc1plugin.cc new file mode 100644 index 000000000000..d54adddb021b --- /dev/null +++ b/lang/gcc13/files/patch-libcc1_libcc1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcc1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -68,8 +69,6 @@ + #include "rpc.hh" + #include "gcc-c-interface.h" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc13/files/patch-libcc1_libcp1plugin.cc b/lang/gcc13/files/patch-libcc1_libcp1plugin.cc new file mode 100644 index 000000000000..0f3d2d161404 --- /dev/null +++ b/lang/gcc13/files/patch-libcc1_libcp1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcp1plugin.cc +@@ -33,6 +33,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -70,8 +71,6 @@ + #include "marshall-cp.hh" + #include "rpc.hh" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc14-devel/files/patch-libcc1_libcc1plugin.cc b/lang/gcc14-devel/files/patch-libcc1_libcc1plugin.cc new file mode 100644 index 000000000000..d54adddb021b --- /dev/null +++ b/lang/gcc14-devel/files/patch-libcc1_libcc1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcc1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -68,8 +69,6 @@ + #include "rpc.hh" + #include "gcc-c-interface.h" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; + diff --git a/lang/gcc14-devel/files/patch-libcc1_libcp1plugin.cc b/lang/gcc14-devel/files/patch-libcc1_libcp1plugin.cc new file mode 100644 index 000000000000..0f3d2d161404 --- /dev/null +++ b/lang/gcc14-devel/files/patch-libcc1_libcp1plugin.cc @@ -0,0 +1,19 @@ +--- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC ++++ libcc1/libcp1plugin.cc +@@ -33,6 +33,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -70,8 +71,6 @@ + #include "marshall-cp.hh" + #include "rpc.hh" + #include "context.hh" +- +-#include + + using namespace cc1_plugin; +