diff options
| author | joerg <joerg@pkgsrc.org> | 2020-03-30 19:46:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-03-30 19:46:01 +0000 |
| commit | 013a1e60425ed491117cc4160cbee4eae69e6655 (patch) | |
| tree | 19e36707d0ae584829656a620fc7481157f298e7 /www/firefox | |
| parent | 9e0f2653dcf44218e5ba3f2af8d1f7402b40808a (diff) | |
| download | pkgsrc-013a1e60425ed491117cc4160cbee4eae69e6655.tar.gz | |
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.
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/mozilla-common.mk | 6 | ||||
| -rw-r--r-- | www/firefox/patches/patch-config_gcc-stl-wrapper.template.h | 29 |
2 files changed, 31 insertions, 4 deletions
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 |