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.

12 files changed, 143 insertions, 16 deletions

diff --git a/www/cliqz/mozilla-common.mk b/www/cliqz/mozilla-common.mk
index 4aa9d71e5f6..f8caaee77c2 100644
--- a/www/cliqz/mozilla-common.mk
+++ b/www/cliqz/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2020/02/23 00:10:40 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2020/03/30 19:46:02 joerg Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -23,8 +23,6 @@ CXXFLAGS+=	-march=i586
 CXXFLAGS+=	-mstackrealign
 .endif
 
-CXXFLAGS+=	-D__HAVE_INLINE___ISINF
-
 CHECK_PORTABILITY_SKIP+=	build-tools/scripts/l10n/release_repacks.sh
 CHECK_PORTABILITY_SKIP+=	mozilla-release/intl/icu/source/configure
 CHECK_PORTABILITY_SKIP+=	mozilla-release/modules/pdfium/update.sh
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 60ab6926119..d7409d5aaae 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.157 2020/03/18 01:27:14 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.158 2020/03/30 19:46:02 joerg Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -21,7 +21,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 gnu++14
-UNLIMIT_RESOURCES+=	datasize
+UNLIMIT_RESOURCES+=	datasize virtualsize
 
 TOOL_DEPENDS+=		cbindgen>=0.13.0:../../devel/cbindgen
 .if ${MACHINE_ARCH} == "sparc64"
@@ -58,8 +58,6 @@ CXXFLAGS+=		-march=i586
 CXXFLAGS+=		-mstackrealign
 .endif
 
-CXXFLAGS+=		-D__HAVE_INLINE___ISINF
-
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/tests/update-test262.sh
diff --git a/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h b/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h
new file mode 100644
index 00000000000..ebedc207882
--- /dev/null
+++ b/www/firefox/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	2020-03-09 13:09:13.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
+@@ -64,4 +64,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h
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>
diff --git a/www/firefox60/distinfo b/www/firefox60/distinfo
index 3c15aea5e57..518b8cd084f 100644
--- a/www/firefox60/distinfo
+++ b/www/firefox60/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/02/08 22:01:36 kamil Exp $
+$NetBSD: distinfo,v 1.23 2020/03/30 19:46:02 joerg Exp $
 
 SHA1 (firefox-60.9.0esr.source.tar.xz) = 616f8afdee741f0bea607a671b8515ef13c68b4a
 RMD160 (firefox-60.9.0esr.source.tar.xz) = f3ef7629ab28960fb383d3fb12dab69feb0f45ee
@@ -8,6 +8,7 @@ SHA1 (patch-aa) = 5e07d1a01762b7face950ca41c71447106341f0d
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
 SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
 SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 07b7cea056a2db080e87c04393261a9a0f514f32
 SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 28c033037ac30636acdc7dd8f6637d5446ff25f7
diff --git a/www/firefox60/mozilla-common.mk b/www/firefox60/mozilla-common.mk
index 53de291ce69..c9f916dee01 100644
--- a/www/firefox60/mozilla-common.mk
+++ b/www/firefox60/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.8 2019/12/28 05:48:06 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.9 2020/03/30 19:46:02 joerg Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -8,7 +8,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 c++
-UNLIMIT_RESOURCES+=	datasize
+UNLIMIT_RESOURCES+=	datasize virtualsize
 
 GCC_REQD+=		4.9
 
diff --git a/www/firefox60/patches/patch-config_gcc-stl-wrapper.template.h b/www/firefox60/patches/patch-config_gcc-stl-wrapper.template.h
new file mode 100644
index 00000000000..2ccf6a3baf0
--- /dev/null
+++ b/www/firefox60/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	2019-09-01 13:09:05.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
+@@ -64,4 +64,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h
diff --git a/www/firefox68/distinfo b/www/firefox68/distinfo
index 916a2b6c9e9..0ceaf1a4001 100644
--- a/www/firefox68/distinfo
+++ b/www/firefox68/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2020/03/12 19:39:35 nia Exp $
+$NetBSD: distinfo,v 1.12 2020/03/30 19:46:03 joerg Exp $
 
 SHA1 (firefox-68.6.0esr.source.tar.xz) = 85d35d0a0190d56585f93c9f117d5c0f52bcbc44
 RMD160 (firefox-68.6.0esr.source.tar.xz) = d11d44f5400ca1f5c3b721dd974a77fbf7cf7e7a
@@ -6,6 +6,7 @@ SHA512 (firefox-68.6.0esr.source.tar.xz) = 84565d654ed8bd2d036d08de4d16e41ae8881
 Size (firefox-68.6.0esr.source.tar.xz) = 313814396 bytes
 SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
 SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index 6a616511f7c..b4e8ba00d84 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.8 2020/03/18 01:33:58 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.9 2020/03/30 19:46:03 joerg Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -23,7 +23,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 gnu++14
-UNLIMIT_RESOURCES+=	datasize
+UNLIMIT_RESOURCES+=	datasize virtualsize
 
 TOOL_DEPENDS+=		cbindgen>=0.8.7:../../devel/cbindgen
 .if ${MACHINE_ARCH} == "sparc64"
@@ -64,8 +64,6 @@ CXXFLAGS+=		-march=i586
 CXXFLAGS+=		-mstackrealign
 .endif
 
-CXXFLAGS+=		-D__HAVE_INLINE___ISINF
-
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/tests/update-test262.sh
diff --git a/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h b/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h
new file mode 100644
index 00000000000..038d9601faa
--- /dev/null
+++ b/www/firefox68/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:03 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig	2020-03-05 20:56:39.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
+@@ -64,4 +64,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h