Fix build with libc++ by making the template wrapper do what it is

supposed to do. Don't mess with math.h internals. Honor ressource limit
changes during build.

3 files changed, 45 insertions, 1 deletions

diff --git a/www/firefox52/distinfo b/www/firefox52/distinfo
index 00074f5d2ec..c73f11ef73d 100644
--- a/www/firefox52/distinfo
+++ b/www/firefox52/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/02/08 21:44:59 kamil Exp $
+$NetBSD: distinfo,v 1.23 2020/03/30 19:46:02 joerg Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
@@ -16,6 +16,7 @@ SHA1 (patch-build_pgo_profileserver.py) = 48ad50f716eda2157cbc225298f6672f164b42
 SHA1 (patch-config_Makefile.in) = fc6d4de55f4d9ab8598d5b89e6630e4685af1795
 SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136
 SHA1 (patch-config_external_moz.build) = 68708dc0fb94119b9f140d05dd737e69bb6bba81
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 4440748c79c0da76cb06bd5b9f36dac6f3dc8b0b
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
 SHA1 (patch-config_system-headers) = fd0cb4d2061af1eaa34313370a57720ed693607f
@@ -118,3 +119,4 @@ SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = 3a902eb9
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
+SHA1 (patch-xpcom_typelib_xpt_xpt__arena.h) = a9cee44921eae1ad6a3ddc14054b1c03dc6f5e84
diff --git a/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h b/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h
new file mode 100644
index 00000000000..a4d8e2b89c0
--- /dev/null
+++ b/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:02 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig	2017-04-11 02:13:09.000000000 +0000
++++ config/gcc-stl-wrapper.template.h
+@@ -28,14 +28,14 @@
+ #endif
+ 
+ // Don't include mozalloc for cstdlib. See bug 1245076.
+-#ifndef moz_dont_include_mozalloc_for_cstdlib
+-#  define moz_dont_include_mozalloc_for_cstdlib
++#ifndef moz_dont_include_mozalloc_for_${HEADER}
++#  define moz_dont_include_mozalloc_for_${HEADER}
+ #endif
+ 
+ // Include mozalloc after the STL header and all other headers it includes
+ // have been preprocessed.
+ #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \
+-    !defined(moz_dont_include_mozalloc_for_${HEADER})
++    !defined(moz_dont_include_mozalloc_for_cstdlib)
+ #  define MOZ_INCLUDE_MOZALLOC_H
+ #  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
+ #endif
+@@ -66,4 +66,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h
diff --git a/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h b/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h
new file mode 100644
index 00000000000..211215dd632
--- /dev/null
+++ b/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-xpcom_typelib_xpt_xpt__arena.h,v 1.1 2020/03/30 19:46:02 joerg Exp $
+
+--- xpcom/typelib/xpt/xpt_arena.h.orig	2020-03-29 17:32:32.848757813 +0000
++++ xpcom/typelib/xpt/xpt_arena.h
+@@ -10,7 +10,7 @@
+ #ifndef __xpt_arena_h__
+ #define __xpt_arena_h__
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include "mozilla/Attributes.h"
+ #include "mozilla/MemoryReporting.h"
+ #include <stdint.h>