From: Jory Pratt <anarchy@gentoo.org>
Date: Sun, 16 Feb 2020 03:05:42 +0000 (-0600)
Subject: www-client/firefox: Fix llvm9 build failure
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1271c2e45284b16f2083fadbadaa57b405b94f1c;p=gentoo.git

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@gentoo.org>
---

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 000000000000..e12417e6a024
--- /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 c4fb0b23ad16..6e104cb56f90 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