Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 May 2021 08:40:13 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: e6b0a4d62727 - 2021Q2 - mail/thunderbird: fix build with clang/libc++12
Message-ID:  <202105180840.14I8eDvO063604@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=e6b0a4d6272751fa08cee3e1d083b2574b1ec3c8

commit e6b0a4d6272751fa08cee3e1d083b2574b1ec3c8
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2021-05-18 08:37:34 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2021-05-18 08:40:04 +0000

    mail/thunderbird: fix build with clang/libc++12
    
    PR:             255954
    Reported by:    dim
    Obtained from:  https://bugzilla.mozilla.org/show_bug.cgi?id=1694575
    
    (cherry picked from commit 5cfd4469d834c0bc282e8f0d2f45ede416290845)
---
 mail/thunderbird/files/patch-bug1694575 | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/mail/thunderbird/files/patch-bug1694575 b/mail/thunderbird/files/patch-bug1694575
new file mode 100644
index 000000000000..bbc563272934
--- /dev/null
+++ b/mail/thunderbird/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?202105180840.14I8eDvO063604>