Date: Tue, 18 May 2021 08:39:56 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 8ed133d651cb - 2021Q2 - www/firefox-esr: fix build with clang/libc++12 Message-ID: <202105180839.14I8du3f058962@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ed133d651cb393faed167f20e0facb0fb81d45d commit 8ed133d651cb393faed167f20e0facb0fb81d45d Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2021-05-18 08:34:50 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2021-05-18 08:39:42 +0000 www/firefox-esr: fix build with clang/libc++12 Reported by: dim Obtained from: https://bugzilla.mozilla.org/show_bug.cgi?id=1694575 PR: 255953 (cherry picked from commit d68bbde38e14ca3ac14b0c21b9f1a0c0a3928d2b) --- www/firefox-esr/files/patch-bug1694575 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/www/firefox-esr/files/patch-bug1694575 b/www/firefox-esr/files/patch-bug1694575 new file mode 100644 index 000000000000..bbc563272934 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1694575 @@ -0,0 +1,33 @@ +changeset: 569030:f875a4ffd653 +user: Mike Hommey <mh+mozilla@glandium.org> +date: Sun Feb 28 17:47:27 2021 +0000 +summary: Bug 1694575 - Don't include mozalloc.h from the iosfwd wrapper. r=andi + +diff -r d31bf2fc599d -r f875a4ffd653 config/gcc-stl-wrapper.template.h +--- config/gcc-stl-wrapper.template.h Sun Feb 28 14:59:31 2021 +0000 ++++ config/gcc-stl-wrapper.template.h Sun Feb 28 17:47:27 2021 +0000 +@@ -27,7 +27,11 @@ + // # define _GLIBCXX_DEBUG 1 + #endif + +-// Don't include mozalloc for cstdlib. See bug 1245076. ++// Don't include mozalloc.h for cstdlib, type_traits, limits and iosfwd. ++// See bug 1245076 (cstdlib), bug 1594027 (type_traits, limits) and ++// bug 1694575 (iosfwd). ++// Please be careful when adding more exceptions, especially regarding ++// the header not directly or indirectly including <new>. + #ifndef moz_dont_include_mozalloc_for_cstdlib + # define moz_dont_include_mozalloc_for_cstdlib + #endif +@@ -40,6 +44,10 @@ + # define moz_dont_include_mozalloc_for_limits + #endif + ++#ifndef moz_dont_include_mozalloc_for_iosfwd ++# define moz_dont_include_mozalloc_for_iosfwd ++#endif ++ + // Include mozalloc after the STL header and all other headers it includes + // have been preprocessed. + #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105180839.14I8du3f058962>