diff options
author | maya <maya@pkgsrc.org> | 2020-02-26 17:48:58 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2020-02-26 17:48:58 +0000 |
commit | e55985ffc1a7e4e907ed01b372d56fe887a1ce99 (patch) | |
tree | be3554471d5d0b481d56af1fc406b8dac1550801 /www | |
parent | ac8e16227bcf0a35322f99a362b1d4172602b1e0 (diff) | |
download | pkgsrc-e55985ffc1a7e4e907ed01b372d56fe887a1ce99.tar.gz |
firefox: limit what is noted as being a hack for NetBSD to NetBSD.
This is causing problems on fedora 31 which gets a function prototype
mismatch from this somehow.
Diffstat (limited to 'www')
-rw-r--r-- | www/firefox/distinfo | 4 | ||||
-rw-r--r-- | www/firefox/patches/patch-config__make_system_wrappers.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 94675930f53..76cd90bb35c 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.382 2020/02/21 15:13:12 ryoon Exp $ +$NetBSD: distinfo,v 1.383 2020/02/26 17:48:58 maya Exp $ SHA1 (firefox-73.0.1.source.tar.xz) = 27948432e868f68951f885394c1165739d6902b3 RMD160 (firefox-73.0.1.source.tar.xz) = d95068e78604695e399b0cf7fa988869a5a33ac7 @@ -7,7 +7,7 @@ Size (firefox-73.0.1.source.tar.xz) = 326596084 bytes SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7 SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8 -SHA1 (patch-config__make_system_wrappers.py) = 4e0a23d5b1f3a4fcb358ce319f6a2421be535375 +SHA1 (patch-config__make_system_wrappers.py) = c17e03e6c0599f2d14de3688af8552c12bbc61ed SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 diff --git a/www/firefox/patches/patch-config__make_system_wrappers.py b/www/firefox/patches/patch-config__make_system_wrappers.py index a8fac36ae2b..4374ab7e2d1 100644 --- a/www/firefox/patches/patch-config__make_system_wrappers.py +++ b/www/firefox/patches/patch-config__make_system_wrappers.py @@ -1,15 +1,17 @@ -$NetBSD: patch-config__make_system_wrappers.py,v 1.2 2019/12/03 14:21:20 ryoon Exp $ +$NetBSD: patch-config__make_system_wrappers.py,v 1.3 2020/02/26 17:48:58 maya Exp $ This is a workaround for building firefox with clang from base, with a conflict with __isinf(__x) in libc++ vs netbsd headers. --- config/make-system-wrappers.py.orig 2019-12-02 12:22:52.000000000 +0000 +++ config/make-system-wrappers.py -@@ -7,6 +7,7 @@ import os +@@ -7,6 +7,9 @@ import os from mozbuild.util import FileAvoidWrite header_template = '''#pragma GCC system_header ++#ifdef __NetBSD__ +#define __isinf(x) __builtin_isinf(x) ++#endif #pragma GCC visibility push(default) {includes} #pragma GCC visibility pop |