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.

4 files changed, 47 insertions, 3 deletions

diff --git a/mail/thunderbird52/Makefile b/mail/thunderbird52/Makefile
index 635ddb9ea12..d05483d8794 100644
--- a/mail/thunderbird52/Makefile
+++ b/mail/thunderbird52/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/03/10 22:10:28 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/30 19:46:01 joerg Exp $
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird${TB_VER:C/\..*$//}-${TB_VER}
@@ -63,7 +63,7 @@ pre-configure:
 
 do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
-	cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
+	${RUN} ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
 MOZILLA=	${PKGBASE}
 MOZILLA_NAME=	${PKGBASE}
diff --git a/mail/thunderbird52/distinfo b/mail/thunderbird52/distinfo
index eff55e28ac6..e422d225e00 100644
--- a/mail/thunderbird52/distinfo
+++ b/mail/thunderbird52/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2020/02/08 22:20:26 kamil Exp $
+$NetBSD: distinfo,v 1.3 2020/03/30 19:46:01 joerg Exp $
 
 SHA1 (thunderbird-52.9.1.source.tar.xz) = 9970d78084fe979f568ea00bf06b8e81a738e630
 RMD160 (thunderbird-52.9.1.source.tar.xz) = b3169a0154fa85648a98ba0d74f264abd224b323
@@ -24,6 +24,7 @@ SHA1 (patch-mozilla_build_pgo_profileserver.py) = 7a88be17fc5939aa2bc5af334dde32
 SHA1 (patch-mozilla_config_Makefile.in) = ef7b31712e3be7620dfaf548d4138c6b425eb2ca
 SHA1 (patch-mozilla_config_baseconfig.mk) = 92891a656cb83de0f5ff7f88d10579cdde0e1359
 SHA1 (patch-mozilla_config_external_moz.build) = bf05e5da3781087c4e588e0bdccaee05b9d02b24
+SHA1 (patch-mozilla_config_gcc-stl-wrapper.template.h) = be32e0e51992278915ffd7c205f9846ca353c89a
 SHA1 (patch-mozilla_config_stl__wrappers_ios) = f84d793f65bc7c7d1ffc7b542f846b394cf6de50
 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = b36e7e199e355a0950e0db51c45fb34ce5ea2cc4
 SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f
@@ -120,3 +121,4 @@ SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) =
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = edbf6721ac8d74dc314f4c70fc5c74ebb6f44076
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = a04a46c13752d4c92bbba8b96d85cb430f3a4ac6
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = bb0d322a00c42e6ce1a5a931fecdcaf1b58109bc
+SHA1 (patch-mozilla_xpcom_typelib_xpt_xpt__arena.h) = 186cc580476fa80836d8ebd1e27de6c30377e89f
diff --git a/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h b/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h
new file mode 100644
index 00000000000..1d18cb1020b
--- /dev/null
+++ b/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-mozilla_config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:01 joerg Exp $
+
+--- mozilla/config/gcc-stl-wrapper.template.h.orig	2018-07-09 19:54:33.000000000 +0000
++++ mozilla/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/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h b/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h
new file mode 100644
index 00000000000..c7ae1d59f77
--- /dev/null
+++ b/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_xpcom_typelib_xpt_xpt__arena.h,v 1.1 2020/03/30 19:46:01 joerg Exp $
+
+--- mozilla/xpcom/typelib/xpt/xpt_arena.h.orig	2018-07-09 19:54:58.000000000 +0000
++++ mozilla/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>