commit:     6c3a5ad5c8ab9377eaefb286aa45d6b19cb20501
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 03:05:42 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 03:08:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=6c3a5ad5

www-client/firefox: Fix llvm9 build failure

Closes: https://bugs.gentoo.org/704924
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 www-client/firefox/files/firefox-73.0_fix_llvm9.patch | 19 +++++++++++++++++++
 www-client/firefox/firefox-73.0.ebuild                |  1 +
 2 files changed, 20 insertions(+)

diff --git a/www-client/firefox/files/firefox-73.0_fix_llvm9.patch 
b/www-client/firefox/files/firefox-73.0_fix_llvm9.patch
new file mode 100644
index 0000000..e12417e
--- /dev/null
+++ b/www-client/firefox/files/firefox-73.0_fix_llvm9.patch
@@ -0,0 +1,19 @@
+diff --git a/config/gcc-stl-wrapper.template.h 
b/config/gcc-stl-wrapper.template.h
+--- a/config/gcc-stl-wrapper.template.h
++++ b/config/gcc-stl-wrapper.template.h
+@@ -32,6 +32,14 @@
+ #  define moz_dont_include_mozalloc_for_cstdlib
+ #endif
+ 
++#ifndef moz_dont_include_mozalloc_for_type_traits
++#  define moz_dont_include_mozalloc_for_type_traits
++#endif
++
++#ifndef moz_dont_include_mozalloc_for_limits
++#  define moz_dont_include_mozalloc_for_limits
++#endif
++
+ // Include mozalloc after the STL header and all other headers it includes
+ // have been preprocessed.
+ #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \
+

diff --git a/www-client/firefox/firefox-73.0.ebuild 
b/www-client/firefox/firefox-73.0.ebuild
index c4fb0b2..6e104cb 100644
--- a/www-client/firefox/firefox-73.0.ebuild
+++ b/www-client/firefox/firefox-73.0.ebuild
@@ -258,6 +258,7 @@ src_prepare() {
        eapply "${WORKDIR}/firefox"
 
        eapply "${FILESDIR}/${PN}-73.0_fix_lto_pgo_builds.patch"
+       eapply "${FILESDIR}/${PN}-73.0_fix_llvm9.patch"
 
        # Allow user to apply any additional patches without modifing ebuild
        eapply_user

Reply via email to