diff options
Diffstat (limited to 'databases/mongodb34/files')
47 files changed, 0 insertions, 3033 deletions
diff --git a/databases/mongodb34/files/mongod.in b/databases/mongodb34/files/mongod.in deleted file mode 100644 index 0bcf12786012..000000000000 --- a/databases/mongodb34/files/mongod.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# PROVIDE: mongod -# REQUIRE: NETWORK ldconfig -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# mongod_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. -# mongod_dbpath (str): Default to "/var/db/mongodb" -# Base database directory. -# mongod_flags (str): Custom additional arguments to be passed to mongod. -# Default to "--logpath ${mongod_dbpath}/mongod.log --logappend". -# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf" -# Path to config file -# - -. /etc/rc.subr - -name="mongod" -rcvar=mongod_enable - -load_rc_config $name - -: ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} -: ${mongod_dbpath="/var/db/mongodb"} -: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"} -: ${mongod_user="mongodb"} -: ${mongod_group="mongodb"} -: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"} - -pidfile="${mongod_dbpath}/mongod.lock" -command=%%PREFIX%%/bin/${name} -command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null" -start_precmd="${name}_prestart" - -mongod_create_dbpath() -{ - mkdir ${mongod_dbpath} >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath} -} - -mongod_prestart() -{ - if [ ! -d ${mongod_dbpath} ]; then - mongod_create_dbpath || return 1 - fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 -} - -run_rc_command "$1" diff --git a/databases/mongodb34/files/patch-SConstruct b/databases/mongodb34/files/patch-SConstruct deleted file mode 100644 index b866992a9593..000000000000 --- a/databases/mongodb34/files/patch-SConstruct +++ /dev/null @@ -1,72 +0,0 @@ ---- SConstruct.orig 2017-06-08 16:11:03 UTC -+++ SConstruct -@@ -929,9 +929,9 @@ if has_option('variables-help'): - print env_vars.GenerateHelpText(env) - Exit(0) - --unknown_vars = env_vars.UnknownVariables() --if unknown_vars: -- env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) -+#unknown_vars = env_vars.UnknownVariables() -+#if unknown_vars: -+# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) - - def set_config_header_define(env, varname, varval = 1): - env['CONFIG_HEADER_DEFINES'][varname] = varval -@@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'): - # If runtime hardening is requested, then build anything - # destined for an executable with the necessary flags for PIE. - env.AppendUnique( -- PROGCCFLAGS=['-fPIE'], -+ PROGCCFLAGS=['-fpic'], - PROGLINKFLAGS=['-pie'], - ) - -@@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'): - "-Wno-unknown-pragmas", - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet -- if env.TargetOSIs('linux', 'osx', 'solaris'): -+ if env.TargetOSIs('linux', 'osx', 'solaris', 'freebsd'): - if not has_option("disable-warnings-as-errors"): - env.Append( CCFLAGS=["-Werror"] ) - -@@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'): - env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) - env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) - -- if optBuild: -- env.Append( CCFLAGS=["-O2"] ) -- else: -- env.Append( CCFLAGS=["-O0"] ) -+ #if optBuild: -+ # env.Append( CCFLAGS=["-O2"] ) -+ #else: -+ # env.Append( CCFLAGS=["-O0"] ) - - # Promote linker warnings into errors. We can't yet do this on OS X because its linker considers - # noall_load obsolete and warns about it. -- if not env.TargetOSIs('osx'): -- env.Append( -- LINKFLAGS=[ -- "-Wl,--fatal-warnings", -- ], -- ) -+ #if not env.TargetOSIs('osx'): -+ # env.Append( -+ # LINKFLAGS=[ -+ # "-Wl,--fatal-warnings", -+ # ], -+ # ) - - mmapv1 = False - if get_option('mmapv1') == 'auto': -@@ -2461,7 +2461,7 @@ def doConfigure(myenv): - }} - """.format(storage_class) - context.Message('Checking for storage class {0} '.format(storage_class)) -- ret = context.TryLink(textwrap.dedent(test_body), ".cpp") -+ ret = context.TryCompile(textwrap.dedent(test_body), ".cpp") - context.Result(ret) - return ret - diff --git a/databases/mongodb34/files/patch-asio-openssl-1.1.0 b/databases/mongodb34/files/patch-asio-openssl-1.1.0 deleted file mode 100644 index e127e0dd6d19..000000000000 --- a/databases/mongodb34/files/patch-asio-openssl-1.1.0 +++ /dev/null @@ -1,666 +0,0 @@ -From 628e3ca9fe7a1bed1ce2308e2df4a1a4ecd1dfe7 Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Fri, 20 Mar 2015 08:46:51 +1100 -Subject: [PATCH] ERR_remove_state is deprecated, use ERR_remove_thread_state - instead. - ---- - asio/include/asio/ssl/detail/impl/openssl_init.ipp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -index 2c40d40..da66fc1 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -@@ -63,7 +63,11 @@ public: - ::CRYPTO_set_id_callback(0); - ::CRYPTO_set_locking_callback(0); - ::ERR_free_strings(); -+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) -+ ::ERR_remove_thread_state(NULL); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10000000L) - ::ERR_remove_state(0); -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L) - ::EVP_cleanup(); - ::CRYPTO_cleanup_all_ex_data(); - ::CONF_modules_unload(1); -From aa21de0944b4327f998fe161dde5ddaaf38cec5c Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Sat, 21 Mar 2015 20:52:42 +1100 -Subject: [PATCH] Remove redundant pointer check in SSL engine. - ---- - asio/include/asio/ssl/detail/impl/engine.ipp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -index 5504411..2e4a39d 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -@@ -206,7 +206,7 @@ const asio::error_code& engine::map_error_code( - - // SSL v2 doesn't provide a protocol-level shutdown, so an eof on the - // underlying transport is passed through. -- if (ssl_ && ssl_->version == SSL2_VERSION) -+ if (ssl_->version == SSL2_VERSION) - return ec; - - // Otherwise, the peer should have negotiated a proper shutdown. -From 6c70257e20ef159c581298b54838361bb54bfce4 Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Thu, 1 Oct 2015 08:44:30 +1000 -Subject: [PATCH] Use SSL_CTX_clear_chain_certs, if available. - ---- - asio/include/asio/ssl/impl/context.ipp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp -index 08705e7..77da84e 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp -@@ -539,11 +539,15 @@ asio::error_code context::use_certificate_chain( - return ec; - } - -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) -+ ::SSL_CTX_clear_chain_certs(handle_); -+#else - if (handle_->extra_certs) - { - ::sk_X509_pop_free(handle_->extra_certs, X509_free); - handle_->extra_certs = 0; - } -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) - - while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0, - handle_->default_passwd_callback, -From 92bfc623e6a71353dd2c783f4c9fef5591ac550d Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Thu, 19 Nov 2015 10:24:56 +1100 -Subject: [PATCH] Add new error category and constant for - ssl::error::stream_truncated. - -This error replaces uses of SSL_R_SHORT_READ, and indicates that the -SSL stream has been shut down abruptly. (I.e. the underlying socket -has been closed without performing an SSL-layer shutdown.) ---- - asio/include/asio/ssl/detail/impl/engine.ipp | 8 ++----- - asio/include/asio/ssl/error.hpp | 34 ++++++++++++++++++++++++++++ - asio/include/asio/ssl/impl/error.ipp | 33 ++++++++++++++++++++++++++- - 3 files changed, 68 insertions(+), 7 deletions(-) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -index b59cf18..9abe010 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -@@ -195,9 +195,7 @@ const asio::error_code& engine::map_error_code( - // If there's data yet to be read, it's an error. - if (BIO_wpending(ext_bio_)) - { -- ec = asio::error_code( -- ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ), -- asio::error::get_ssl_category()); -+ ec = asio::ssl::error::stream_truncated; - return ec; - } - -@@ -209,9 +207,7 @@ const asio::error_code& engine::map_error_code( - // Otherwise, the peer should have negotiated a proper shutdown. - if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0) - { -- ec = asio::error_code( -- ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ), -- asio::error::get_ssl_category()); -+ ec = asio::ssl::error::stream_truncated; - } - - return ec; -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp -index 1385d2a..f044f59 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp -@@ -25,6 +25,7 @@ namespace error { - - enum ssl_errors - { -+ // Error numbers are those produced by openssl. - }; - - extern ASIO_DECL -@@ -34,6 +35,23 @@ static const asio::error_category& ssl_category - = asio::error::get_ssl_category(); - - } // namespace error -+namespace ssl { -+namespace error { -+ -+enum stream_errors -+{ -+ /// The underlying stream closed before the ssl stream gracefully shut down. -+ stream_truncated = 1 -+}; -+ -+extern ASIO_DECL -+const asio::error_category& get_stream_category(); -+ -+static const asio::error_category& stream_category -+ = asio::ssl::error::get_stream_category(); -+ -+} // namespace error -+} // namespace ssl - } // namespace asio - - #if defined(ASIO_HAS_STD_SYSTEM_ERROR) -@@ -44,6 +62,11 @@ template<> struct is_error_code_enum<asio::error::ssl_errors> - static const bool value = true; - }; - -+template<> struct is_error_code_enum<asio::ssl::error::stream_errors> -+{ -+ static const bool value = true; -+}; -+ - } // namespace std - #endif // defined(ASIO_HAS_STD_SYSTEM_ERROR) - -@@ -57,6 +80,17 @@ inline asio::error_code make_error_code(ssl_errors e) - } - - } // namespace error -+namespace ssl { -+namespace error { -+ -+inline asio::error_code make_error_code(stream_errors e) -+{ -+ return asio::error_code( -+ static_cast<int>(e), get_stream_category()); -+} -+ -+} // namespace error -+} // namespace ssl - } // namespace asio - - #include "asio/detail/pop_options.hpp" -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp -index 9e76039..8c20e81 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp -@@ -23,7 +23,6 @@ - - namespace asio { - namespace error { -- - namespace detail { - - class ssl_category : public asio::error_category -@@ -50,6 +49,38 @@ const asio::error_category& get_ssl_category() - } - - } // namespace error -+namespace ssl { -+namespace error { -+namespace detail { -+ -+class stream_category : public asio::error_category -+{ -+public: -+ const char* name() const ASIO_ERROR_CATEGORY_NOEXCEPT -+ { -+ return "asio.ssl.stream"; -+ } -+ -+ std::string message(int value) const -+ { -+ switch (value) -+ { -+ case stream_truncated: return "stream truncated"; -+ default: return "asio.ssl.stream error"; -+ } -+ } -+}; -+ -+} // namespace detail -+ -+const asio::error_category& get_stream_category() -+{ -+ static detail::stream_category instance; -+ return instance; -+} -+ -+} // namespace error -+} // namespace ssl - } // namespace asio - - #include "asio/detail/pop_options.hpp" -From 5fa80539834c10406611bb02c20cdba2a9171f4a Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Thu, 19 Nov 2015 10:25:42 +1100 -Subject: [PATCH] BoringSSL does not provide CONF_modules_unload. - ---- - asio/include/asio/ssl/detail/impl/openssl_init.ipp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -index da66fc1..2a70bf5 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -@@ -70,7 +70,9 @@ public: - #endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L) - ::EVP_cleanup(); - ::CRYPTO_cleanup_all_ex_data(); -+#if !defined(OPENSSL_IS_BORINGSSL) - ::CONF_modules_unload(1); -+#endif // !defined(OPENSSL_IS_BORINGSSL) - #if !defined(OPENSSL_NO_ENGINE) - ::ENGINE_cleanup(); - #endif // !defined(OPENSSL_NO_ENGINE) -From 062b19c97bb85f4625b46f93ee19b234948ff235 Mon Sep 17 00:00:00 2001 -From: Marcel Raad <raad@teamviewer.com> -Date: Fri, 1 Apr 2016 10:46:17 +0200 -Subject: [PATCH] Add compatibility with OpenSSL 1.1 - SSLv2 has been - completely removed from OpenSSL, even without OPENSSL_NO_SSL2 - there is a - new threading API without locking callbacks - struct SSL_CTX has been made - opaque and must be used via accessor functions - some cleanup functions have - been removed - ---- - asio/include/asio/ssl/detail/impl/engine.ipp | 2 + - asio/include/asio/ssl/detail/impl/openssl_init.ipp | 20 ++++-- - asio/include/asio/ssl/impl/context.ipp | 71 +++++++++++++++++----- - 3 files changed, 72 insertions(+), 21 deletions(-) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -index fa5d4b0..22b7cdd 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp -@@ -201,8 +201,10 @@ const asio::error_code& engine::map_error_code( - - // SSL v2 doesn't provide a protocol-level shutdown, so an eof on the - // underlying transport is passed through. -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - if (ssl_->version == SSL2_VERSION) - return ec; -+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) - - // Otherwise, the peer should have negotiated a proper shutdown. - if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0) -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -index 700b678..62a49cd 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -@@ -39,11 +39,13 @@ public: - ::SSL_load_error_strings(); - ::OpenSSL_add_all_algorithms(); - -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - mutexes_.resize(::CRYPTO_num_locks()); - for (size_t i = 0; i < mutexes_.size(); ++i) - mutexes_[i].reset(new asio::detail::mutex); - ::CRYPTO_set_locking_callback(&do_init::openssl_locking_func); - ::CRYPTO_set_id_callback(&do_init::openssl_id_func); -+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) -@@ -60,22 +62,26 @@ public: - #endif // !defined(SSL_OP_NO_COMPRESSION) - // && (OPENSSL_VERSION_NUMBER >= 0x00908000L) - -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - ::CRYPTO_set_id_callback(0); - ::CRYPTO_set_locking_callback(0); - ::ERR_free_strings(); --#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) -- ::ERR_remove_thread_state(NULL); --#else // (OPENSSL_VERSION_NUMBER >= 0x10000000L) -- ::ERR_remove_state(0); --#endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L) - ::EVP_cleanup(); - ::CRYPTO_cleanup_all_ex_data(); -+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) -+ ::ERR_remove_state(0); -+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) -+ ::ERR_remove_thread_state(NULL); -+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) - #if !defined(OPENSSL_IS_BORINGSSL) - ::CONF_modules_unload(1); - #endif // !defined(OPENSSL_IS_BORINGSSL) --#if !defined(OPENSSL_NO_ENGINE) -+#if !defined(OPENSSL_NO_ENGINE) \ -+ && (OPENSSL_VERSION_NUMBER < 0x10100000L) - ::ENGINE_cleanup(); - #endif // !defined(OPENSSL_NO_ENGINE) -+ // && (OPENSSL_VERSION_NUMBER < 0x10100000L) - } - - #if !defined(SSL_OP_NO_COMPRESSION) \ -@@ -104,10 +110,12 @@ private: - static void openssl_locking_func(int mode, int n, - const char* /*file*/, int /*line*/) - { -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - if (mode & CRYPTO_LOCK) - instance()->mutexes_[n]->lock(); - else - instance()->mutexes_[n]->unlock(); -+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) - } - - // Mutexes to be used in locking callbacks. -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp -index 02210d9..fde7709 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp -@@ -66,7 +66,8 @@ context::context(context::method m) - - switch (m) - { --#if defined(OPENSSL_NO_SSL2) -+#if defined(OPENSSL_NO_SSL2) \ -+ || (OPENSSL_VERSION_NUMBER >= 0x10100000L) - case context::sslv2: - case context::sslv2_client: - case context::sslv2_server: -@@ -74,6 +75,7 @@ context::context(context::method m) - asio::error::invalid_argument, "context"); - break; - #else // defined(OPENSSL_NO_SSL2) -+ // || (OPENSSL_VERSION_NUMBER >= 0x10100000L) - case context::sslv2: - handle_ = ::SSL_CTX_new(::SSLv2_method()); - break; -@@ -84,6 +86,7 @@ context::context(context::method m) - handle_ = ::SSL_CTX_new(::SSLv2_server_method()); - break; - #endif // defined(OPENSSL_NO_SSL2) -+ // || (OPENSSL_VERSION_NUMBER >= 0x10100000L) - #if defined(OPENSSL_NO_SSL3) - case context::sslv3: - case context::sslv3_client: -@@ -192,13 +195,22 @@ context::~context() - { - if (handle_) - { -- if (handle_->default_passwd_callback_userdata) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ void* cb_userdata = handle_->default_passwd_callback_userdata; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ if (cb_userdata) - { - detail::password_callback_base* callback = - static_cast<detail::password_callback_base*>( -- handle_->default_passwd_callback_userdata); -+ cb_userdata); - delete callback; -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) - handle_->default_passwd_callback_userdata = 0; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) - } - - if (SSL_CTX_get_app_data(handle_)) -@@ -528,10 +540,17 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain( - bio_cleanup bio = { make_buffer_bio(chain) }; - if (bio.p) - { -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); -+ void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ pem_password_cb* callback = handle_->default_passwd_callback; -+ void* cb_userdata = handle_->default_passwd_callback_userdata; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) - x509_cleanup cert = { - ::PEM_read_bio_X509_AUX(bio.p, 0, -- handle_->default_passwd_callback, -- handle_->default_passwd_callback_userdata) }; -+ callback, -+ cb_userdata) }; - if (!cert.p) - { - ec = asio::error_code(ERR_R_PEM_LIB, -@@ -559,8 +578,8 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain( - #endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) - - while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0, -- handle_->default_passwd_callback, -- handle_->default_passwd_callback_userdata)) -+ callback, -+ cb_userdata)) - { - if (!::SSL_CTX_add_extra_chain_cert(handle_, cacert)) - { -@@ -625,6 +644,14 @@ ASIO_SYNC_OP_VOID context::use_private_key( - { - ::ERR_clear_error(); - -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); -+ void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ pem_password_cb* callback = handle_->default_passwd_callback; -+ void* cb_userdata = handle_->default_passwd_callback_userdata; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ - bio_cleanup bio = { make_buffer_bio(private_key) }; - if (bio.p) - { -@@ -636,8 +663,8 @@ ASIO_SYNC_OP_VOID context::use_private_key( - break; - case context_base::pem: - evp_private_key.p = ::PEM_read_bio_PrivateKey( -- bio.p, 0, handle_->default_passwd_callback, -- handle_->default_passwd_callback_userdata); -+ bio.p, 0, callback, -+ cb_userdata); - break; - default: - { -@@ -684,6 +711,14 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key( - { - ::ERR_clear_error(); - -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); -+ void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ pem_password_cb* callback = handle_->default_passwd_callback; -+ void* cb_userdata = handle_->default_passwd_callback_userdata; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ - bio_cleanup bio = { make_buffer_bio(private_key) }; - if (bio.p) - { -@@ -695,8 +730,8 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key( - break; - case context_base::pem: - rsa_private_key.p = ::PEM_read_bio_RSAPrivateKey( -- bio.p, 0, handle_->default_passwd_callback, -- handle_->default_passwd_callback_userdata); -+ bio.p, 0, callback, -+ cb_userdata); - break; - default: - { -@@ -915,11 +950,17 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx) - ASIO_SYNC_OP_VOID context::do_set_password_callback( - detail::password_callback_base* callback, asio::error_code& ec) - { -- if (handle_->default_passwd_callback_userdata) -- delete static_cast<detail::password_callback_base*>( -- handle_->default_passwd_callback_userdata); -- -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); -+ ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); -+#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ void* old_callback = handle_->default_passwd_callback_userdata; - handle_->default_passwd_callback_userdata = callback; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ -+ if (old_callback) -+ delete static_cast<detail::password_callback_base*>( -+ old_callback); - - SSL_CTX_set_default_passwd_cb(handle_, &context::password_callback_function); - -From 69e44a4cc6eb5ba21ede409779a7b777c0eb3869 Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Sun, 28 Aug 2016 10:02:08 +1000 -Subject: [PATCH] Fix errors when OPENSSL_NO_DEPRECATED is defined. - ---- - asio/include/asio/ssl/detail/impl/openssl_init.ipp | 23 +++++++++++----------- - asio/include/asio/ssl/detail/openssl_types.hpp | 2 ++ - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -index 62a49cd..4cc9859 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -@@ -44,8 +44,10 @@ public: - for (size_t i = 0; i < mutexes_.size(); ++i) - mutexes_[i].reset(new asio::detail::mutex); - ::CRYPTO_set_locking_callback(&do_init::openssl_locking_func); -- ::CRYPTO_set_id_callback(&do_init::openssl_id_func); - #endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) -+ ::CRYPTO_set_id_callback(&do_init::openssl_id_func); -+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) -@@ -62,8 +64,10 @@ public: - #endif // !defined(SSL_OP_NO_COMPRESSION) - // && (OPENSSL_VERSION_NUMBER >= 0x00908000L) - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) - ::CRYPTO_set_id_callback(0); -+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - ::CRYPTO_set_locking_callback(0); - ::ERR_free_strings(); - ::EVP_cleanup(); -@@ -94,38 +98,33 @@ public: - // && (OPENSSL_VERSION_NUMBER >= 0x00908000L) - - private: -+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) - static unsigned long openssl_id_func() - { - #if defined(ASIO_WINDOWS) || defined(__CYGWIN__) - return ::GetCurrentThreadId(); - #else // defined(ASIO_WINDOWS) || defined(__CYGWIN__) -- void* id = instance()->thread_id_; -- if (id == 0) -- instance()->thread_id_ = id = &id; // Ugh. -+ void* id = &errno; - ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); - return reinterpret_cast<unsigned long>(id); - #endif // defined(ASIO_WINDOWS) || defined(__CYGWIN__) - } -+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) - -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - static void openssl_locking_func(int mode, int n, - const char* /*file*/, int /*line*/) - { --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - if (mode & CRYPTO_LOCK) - instance()->mutexes_[n]->lock(); - else - instance()->mutexes_[n]->unlock(); --#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) - } - - // Mutexes to be used in locking callbacks. - std::vector<asio::detail::shared_ptr< - asio::detail::mutex> > mutexes_; -- --#if !defined(ASIO_WINDOWS) && !defined(__CYGWIN__) -- // The thread identifiers to be used by openssl. -- asio::detail::tss_ptr<void> thread_id_; --#endif // !defined(ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp -index d9cfc71..eda740d 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp -@@ -21,7 +21,9 @@ - #if !defined(OPENSSL_NO_ENGINE) - # include <openssl/engine.h> - #endif // !defined(OPENSSL_NO_ENGINE) -+#include <openssl/dh.h> - #include <openssl/err.h> -+#include <openssl/rsa.h> - #include <openssl/x509v3.h> - #include "asio/detail/socket_types.hpp" - -From 2cde22623ca0fd9571d8d57c5a8965082d815e1c Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff <chris@kohlhoff.com> -Date: Tue, 13 Sep 2016 21:59:03 +1000 -Subject: [PATCH] Call SSL_COMP_free_compression_methods() on ssl cleanup. - -This call is needed for OpenSSL >=1.0.2 and <1.1.0. ---- - asio/include/asio/ssl/detail/impl/openssl_init.ipp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -index 4cc9859..392eff9 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -@@ -78,6 +78,11 @@ public: - #elif (OPENSSL_VERSION_NUMBER < 0x10100000L) - ::ERR_remove_thread_state(NULL); - #endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \ -+ && (OPENSSL_VERSION_NUMBER < 0x10100000L) -+ ::SSL_COMP_free_compression_methods(); -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) -+ // && (OPENSSL_VERSION_NUMBER < 0x10100000L) - #if !defined(OPENSSL_IS_BORINGSSL) - ::CONF_modules_unload(1); - #endif // !defined(OPENSSL_IS_BORINGSSL) -From dc2b5b9ac09326ba1e38a28b48170063ca2b1332 Mon Sep 17 00:00:00 2001 -From: Marcel Raad <MarcelRaad@users.noreply.github.com> -Date: Mon, 31 Oct 2016 10:32:19 +0100 -Subject: [PATCH] Fix compilation with OpenSSL 1.1 API - -With OPENSSL_API_COMPAT=0x10100000L, SSL_library_init, SSL_load_error_strings, and OpenSSL_add_all_algorithms are removed. -With OPENSSL_API_COMPAT=0x10000000L, these are function-style macros mapping to OPENSSL_init_ssl, which is called automatically anyway. - -References: -https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html -https://www.openssl.org/docs/man1.1.0/crypto/OPENSSL_init_crypto.html ---- - asio/include/asio/ssl/detail/impl/openssl_init.ipp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -index 392eff9..5de0caa 100644 ---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp -@@ -35,11 +35,11 @@ class openssl_init_base::do_init - public: - do_init() - { -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - ::SSL_library_init(); - ::SSL_load_error_strings(); - ::OpenSSL_add_all_algorithms(); - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - mutexes_.resize(::CRYPTO_num_locks()); - for (size_t i = 0; i < mutexes_.size(); ++i) - mutexes_[i].reset(new asio::detail::mutex); diff --git a/databases/mongodb34/files/patch-rpm_mongod.conf b/databases/mongodb34/files/patch-rpm_mongod.conf deleted file mode 100644 index 199b9508db94..000000000000 --- a/databases/mongodb34/files/patch-rpm_mongod.conf +++ /dev/null @@ -1,31 +0,0 @@ ---- rpm/mongod.conf.orig 2017-04-20 21:43:42 UTC -+++ rpm/mongod.conf -@@ -1,4 +1,4 @@ --# mongod.conf -+# mongodb.conf - - # for documentation of all options, see: - # http://docs.mongodb.org/manual/reference/configuration-options/ -@@ -7,11 +7,11 @@ - systemLog: - destination: file - logAppend: true -- path: /var/log/mongodb/mongod.log -+ path: /var/db/mongodb/mongod.log - - # Where and how to store data. - storage: -- dbPath: /var/lib/mongo -+ dbPath: /var/db/mongodb - journal: - enabled: true - # engine: -@@ -21,7 +21,7 @@ storage: - # how the process runs - processManagement: - fork: true # fork and run in background -- pidFilePath: /var/run/mongodb/mongod.pid # location of pidfile -+ pidFilePath: /var/db/mongodb/mongod.lock # location of pidfile - - # network interfaces - net: diff --git a/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp b/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp deleted file mode 100644 index 59575f685129..000000000000 --- a/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mongo/crypto/sha1_block_openssl.cpp.orig 2017-06-27 19:02:43 UTC -+++ src/mongo/crypto/sha1_block_openssl.cpp -@@ -42,7 +42,7 @@ - #include <openssl/evp.h> - #include <openssl/hmac.h> - #include <openssl/sha.h> --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - namespace { - // Copies of OpenSSL after 1.1.0 define new EVP digest routines. We must - // polyfill used definitions to interact with older OpenSSL versions. diff --git a/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp b/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp deleted file mode 100644 index a54eb2a05567..000000000000 --- a/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp +++ /dev/null @@ -1,14 +0,0 @@ -https://jira.mongodb.org/browse/SERVER-32516 -https://github.com/mongodb/mongo/commit/3c34eda8d8a3 - ---- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC -+++ src/mongo/db/repl/oplog_fetcher.cpp -@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p - if (!metadataResult.isOK()) { - return metadataResult.getStatus(); - } -- oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue()); -+ oqMetadata = boost::make_optional(metadataResult.getValue()); - } - return oqMetadata; - } diff --git a/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp b/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp deleted file mode 100644 index c74bea0829fc..000000000000 --- a/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mongo/util/net/ssl_manager.cpp.orig 2018-08-29 22:42:21.000000000 +0200 -+++ src/mongo/util/net/ssl_manager.cpp 2018-12-23 21:05:48.170857000 +0100 -@@ -158,7 +158,7 @@ - #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS - // clang-format on - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - // Copies of OpenSSL after 1.1.0 define new functions for interaction with - // X509 structure. We must polyfill used definitions to interact with older - // OpenSSL versions. diff --git a/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.h b/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.h deleted file mode 100644 index c0d5ea917557..000000000000 --- a/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/mongo/util/net/ssl_manager.h.orig 2019-02-04 15:20:46.451365000 +0100 -+++ src/mongo/util/net/ssl_manager.h 2019-02-04 15:20:15.688896000 +0100 -@@ -222,6 +222,7 @@ - kTLS10, - kTLS11, - kTLS12, -+ kTLS13, - }; - - /** diff --git a/databases/mongodb34/files/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h b/databases/mongodb34/files/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h deleted file mode 100644 index d69f64e36109..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig 2017-09-07 19:28:48 UTC -+++ src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h -@@ -42,7 +42,7 @@ - #include <ctype.h> - - // Fix system header issue on Sun solaris and define required type by ourselves --#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) -+#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(_WCHAR_T_DECLARED) - typedef int wchar_t; - #endif - -@@ -150,7 +150,7 @@ typedef BID_UINT128 _Quad; - /////////////////////////////////////////////////////// - // This section may move to fenv_support.h - --#if !defined(__FENV_H_INCLUDED) && !defined (_FENV_H) && !defined(_FENV_INCLUDED) /* Otherwise we already defined fexcept_t type */ -+#if !defined(__FENV_H_INCLUDED) && !defined (_FENV_H) && !defined(_FENV_INCLUDED) && !defined (_FENV_H_) /* Otherwise we already defined fexcept_t type */ - #if defined(__ECL) || defined(__ECC) /* Intel(R) Itanium(R) architecture */ - /* Default 64-bit Floating Point Status Register */ - #if defined(__linux__) diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_SConscript b/databases/mongodb34/files/patch-src_third__party_mozjs-45_SConscript deleted file mode 100644 index 3dcede3a8957..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_SConscript +++ /dev/null @@ -1,18 +0,0 @@ ---- src/third_party/mozjs-45/SConscript.orig 2017-09-07 19:28:48 UTC -+++ src/third_party/mozjs-45/SConscript -@@ -93,7 +93,6 @@ env.Prepend(CPPPATH=[ - sources = [ - "extract/js/src/builtin/RegExp.cpp", - "extract/js/src/frontend/Parser.cpp", -- "extract/js/src/jit/ProcessExecutableMemory.cpp", - "extract/js/src/jsarray.cpp", - "extract/js/src/jsatom.cpp", - "extract/js/src/jsmath.cpp", -@@ -108,6 +107,7 @@ sources = [ - - if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('solaris'): - sources.extend([ -+ "extract/js/src/jit/ProcessExecutableMemory.cpp", - "extract/js/src/jit/x86-shared/Disassembler-x86-shared.cpp", - ]) - diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp deleted file mode 100644 index edb1b47fba16..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "asmjs/AsmJSFrameIterator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "asmjs/AsmJSLink.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "asmjs/AsmJSModule.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "asmjs/AsmJSSignalHandlers.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "asmjs/AsmJSValidate.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "asmjs/WasmGenerator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp deleted file mode 100644 index 04eef94ea81f..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "asmjs/WasmIonCompile.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "asmjs/WasmStubs.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/AtomicsObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/Eval.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/Intl.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/MapObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp deleted file mode 100644 index f6b30bfd951d..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/BaselineFrameInfo.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineIC.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineInspector.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineJIT.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BitSet.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BytecodeAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp deleted file mode 100644 index 4e081f086865..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/C1Spewer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/CodeGenerator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/CompileWrappers.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Disassembler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/EagerSimdUnbox.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/EdgeCaseAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp deleted file mode 100644 index 49f69a406eda..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/EffectiveAddressAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/ExecutableAllocator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/InstructionReordering.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Ion.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/IonAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/IonBuilder.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp deleted file mode 100644 index 90e62bfbfac0..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/IonCaches.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/IonOptimizationLevels.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/JSONSpewer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/JitFrames.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/JitOptions.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/JitSpewer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp deleted file mode 100644 index 5b99918bbea2..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/JitcodeMap.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/LICM.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/LIR.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/LoopUnroller.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Lowering.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/MCallOptimize.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp deleted file mode 100644 index 9d16af560aa9..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/MIR.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/MIRGraph.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/MacroAssembler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/MoveResolver.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/OptimizationTracking.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/PerfSpewer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp deleted file mode 100644 index 51f199aa1abb..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/ProcessExecutableMemory.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/RangeAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Recover.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/RegisterAllocator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/RematerializedFrame.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Safepoints.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp deleted file mode 100644 index 44a72cf25939..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/ScalarReplacement.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/SharedIC.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Sink.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Snapshots.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/StupidAllocator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/TypePolicy.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp deleted file mode 100644 index 154597bc6992..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/TypedObjectPrediction.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/VMFunctions.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/ValueNumbering.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/none/Trampoline-none.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/shared/BaselineCompiler-shared.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/shared/CodeGenerator-shared.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp deleted file mode 100644 index cc306a2122bd..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/shared/Lowering-shared.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsalloc.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsapi.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsbool.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jscntxt.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jscompartment.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp deleted file mode 100644 index bbc5c015229a..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "builtin/ModuleObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/Object.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/Profilers.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/Reflect.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/ReflectParse.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/SIMD.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp deleted file mode 100644 index 8d92bc711a18..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jsdate.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsdtoa.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsexn.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsfriendapi.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsfun.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsgc.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp deleted file mode 100644 index 97cfa2263100..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jsiter.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsnativestack.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsnum.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsobj.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "json.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "json.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsopcode.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp deleted file mode 100644 index 7289f0dc1b50..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jsprf.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jspropertytree.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsscript.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsstr.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jswatchpoint.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jsweakmap.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp deleted file mode 100644 index f0866046fc37..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "perf/jsperf.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/BaseProxyHandler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/CrossCompartmentWrapper.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/DeadObjectProxy.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/DirectProxyHandler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/OpaqueCrossCompartmentWrapper.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp deleted file mode 100644 index cfc00cd51f86..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "proxy/Proxy.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/ScriptedDirectProxyHandler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/ScriptedIndirectProxyHandler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/ScriptedIndirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/SecurityWrapper.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "proxy/Wrapper.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ArgumentsObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp deleted file mode 100644 index 6c877ec00567..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/ArrayBufferObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/CallNonGenericMethod.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/CharacterEncoding.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/CodeCoverage.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Compression.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/DateTime.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp deleted file mode 100644 index 4b44e971f8c7..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/Debugger.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/DebuggerMemory.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ErrorObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ForOfIterator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/GeneratorObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/GlobalObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp deleted file mode 100644 index c10620c555a9..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/HelperThreads.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Id.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Interpreter.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/JSONParser.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/MemoryMetrics.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Monitor.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp deleted file mode 100644 index 99c79d0449bb..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/NativeObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ObjectGroup.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/PIC.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/PosixNSPR.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Printer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Probes.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp deleted file mode 100644 index f142a3063745..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/ProxyObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ReceiverGuard.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/RegExpObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/RegExpStatics.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Runtime.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/SPSProfiler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp deleted file mode 100644 index 8e94f79de0c6..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "builtin/SymbolObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/TestingFunctions.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/TypedObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/WeakMapObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/WeakSetObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "devtools/sharkctl.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp deleted file mode 100644 index 4610cb1fac9f..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/SavedStacks.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ScopeObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/SelfHosting.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Shape.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/SharedArrayObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Stack.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp deleted file mode 100644 index 9573e3f32c86..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/Stopwatch.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/String.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/StringBuffer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/StructuredClone.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Symbol.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/TaggedProto.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp deleted file mode 100644 index 55eb89771f9e..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/Time.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/TypeInference.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/TypedArrayObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/UbiNode.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/UbiNodeCensus.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/UnboxedObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp deleted file mode 100644 index 88ae6bb981b1..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp +++ /dev/null @@ -1,40 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp -@@ -0,0 +1,37 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/Unicode.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Value.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/WeakMapPtr.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Xdr.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp deleted file mode 100644 index 80dbeb0e5b69..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "ds/LifoAlloc.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "frontend/BytecodeCompiler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "frontend/BytecodeEmitter.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "frontend/FoldConstants.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "frontend/NameFunctions.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "frontend/ParseMaps.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp deleted file mode 100644 index a7c03f03e2df..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "frontend/ParseNode.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "frontend/TokenStream.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Allocator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Barrier.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/GCTrace.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Iteration.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp deleted file mode 100644 index 441a9e6e4076..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "gc/Marking.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Memory.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/MemoryProfiler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Nursery.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/RootMarking.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Statistics.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp deleted file mode 100644 index 3c80c5192fcc..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "gc/Tracer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Verifier.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "gc/Zone.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "irregexp/NativeRegExpMacroAssembler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "irregexp/RegExpAST.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "irregexp/RegExpEngine.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp deleted file mode 100644 index c4f2c62fbdfb..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "irregexp/RegExpInterpreter.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "irregexp/RegExpMacroAssembler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "irregexp/RegExpParser.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "irregexp/RegExpStack.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/AliasAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/AlignmentMaskAnalysis.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp deleted file mode 100644 index 22a40ea30f6d..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "jit/BacktrackingAllocator.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/Bailouts.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineBailouts.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineCompiler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineDebugModeOSR.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "jit/BaselineFrame.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h deleted file mode 100644 index c2c925077075..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h +++ /dev/null @@ -1,91 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h -@@ -0,0 +1,88 @@ -+/* List of defines generated by configure. Included with preprocessor flag, -+ * -include, to avoid long list of -D defines on the compile command-line. -+ * Do not edit. -+ */ -+ -+#ifndef js_confdefs_h -+#define js_confdefs_h -+ -+#define CPP_THROW_NEW throw() -+#define D_INO d_ino -+#define EDITLINE 1 -+#define HAVE_64BIT_BUILD 1 -+#define HAVE_ACOSH 1 -+#define HAVE_ASINH 1 -+#define HAVE_ATANH 1 -+#define HAVE_CBRT 1 -+#define HAVE_CLOCK_MONOTONIC 1 -+#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1 -+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1 -+#define HAVE_DIRENT_H 1 -+#define HAVE_DLOPEN 1 -+#define HAVE_EXPM1 1 -+#define HAVE_GETC_UNLOCKED 1 -+#define HAVE_GETOPT_H 1 -+#define HAVE_GMTIME_R 1 -+#define HAVE_I18N_LC_MESSAGES 1 -+#define HAVE_LANGINFO_CODESET 1 -+#define HAVE_LIBM 1 -+#define HAVE_LOCALECONV 1 -+#define HAVE_LOCALECONV 1 -+#define HAVE_LOCALTIME_R 1 -+#define HAVE_LOG1P 1 -+#define HAVE_LOG2 1 -+#define HAVE_MACHINE_ENDIAN_H 1 -+#define HAVE_MALLOC_USABLE_SIZE 1 -+#define HAVE_MBRTOWC 1 -+#define HAVE_MEMORY_H 1 -+#define HAVE_NL_TYPES_H 1 -+#define HAVE_POSIX_FADVISE 1 -+#define HAVE_POSIX_FALLOCATE 1 -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_RES_NINIT 1 -+#define HAVE_SETLOCALE 1 -+#define HAVE_SSIZE_T 1 -+#define HAVE_STRNDUP 1 -+#define HAVE_SYS_CDEFS_H 1 -+#define HAVE_SYS_MOUNT_H 1 -+#define HAVE_SYS_STATVFS_H 1 -+#define HAVE_THREAD_TLS_KEYWORD 1 -+#define HAVE_TM_ZONE_TM_GMTOFF 1 -+#define HAVE_UNISTD_H 1 -+#define HAVE_VALLOC 1 -+#define HAVE_VA_COPY 1 -+#define HAVE_VISIBILITY_ATTRIBUTE 1 -+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1 -+#define HAVE_WCRTOMB 1 -+#define HAVE___CXA_DEMANGLE 1 -+#define JS_CODEGEN_NONE 1 -+#define JS_DEFAULT_JITREPORT_GRANULARITY 3 -+#define JS_HAVE_MACHINE_ENDIAN_H 1 -+#define JS_POSIX_NSPR 1 -+#define JS_PUNBOX64 1 -+#define JS_STANDALONE 1 -+#define MALLOC_H <malloc_np.h> -+#define MALLOC_USABLE_SIZE_CONST_PTR const -+#define MOZILLA_UAVERSION "45.0" -+#define MOZILLA_VERSION "45.8.0" -+#define MOZILLA_VERSION_U 45.8.0 -+#define MOZJS_MAJOR_VERSION 45 -+#define MOZJS_MINOR_VERSION 8 -+#define MOZ_DEBUG_SYMBOLS 1 -+#define MOZ_DLL_SUFFIX ".so" -+#define MOZ_GLUE_IN_PROGRAM 1 -+#define MOZ_MEMORY 1 -+#define MOZ_MEMORY_BSD 1 -+#define MOZ_UPDATE_CHANNEL default -+#define NO_NSPR_10_SUPPORT 1 -+#define RELEASE_BUILD 1 -+#define STDC_HEADERS 1 -+#define VA_COPY va_copy -+#define XP_UNIX 1 -+#define X_DISPLAY_MISSING 1 -+#define _REENTRANT 1 -+#define _THREAD_SAFE 1 -+ -+#include "js/RequiredDefines.h" -+ -+#endif /* js_confdefs_h */ diff --git a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h deleted file mode 100644 index 2a4b3937e124..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h +++ /dev/null @@ -1,62 +0,0 @@ ---- src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h.orig 2018-07-09 06:37:13 UTC -+++ src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h -@@ -0,0 +1,59 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * vim: set ts=8 sw=4 et tw=78: -+ * -+ * This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef js_config_h -+#define js_config_h -+ -+/* Definitions set at build time that affect SpiderMonkey's public API. -+ This header file is generated by the SpiderMonkey configure script, -+ and installed along with jsapi.h. */ -+ -+/* Define to 1 if SpiderMonkey is in debug mode. */ -+/* #undef JS_DEBUG */ -+ -+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */ -+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */ -+ -+/* Define to 1 if SpiderMonkey should support multi-threaded clients. */ -+/* #undef JS_THREADSAFE */ -+ -+/* Define to 1 if SpiderMonkey should include ctypes support. */ -+/* #undef JS_HAS_CTYPES */ -+ -+/* Define to 1 if SpiderMonkey should support the ability to perform -+ entirely too much GC. */ -+/* #undef JS_GC_ZEAL */ -+ -+/* Define to 1 if SpiderMonkey should use small chunks. */ -+/* #undef JS_GC_SMALL_CHUNK_SIZE */ -+ -+/* Define to 1 to perform extra assertions and heap poisoning. */ -+/* #undef JS_CRASH_DIAGNOSTICS */ -+ -+/* Define to 1 if the <endian.h> header is present and -+ useable. See jscpucfg.h. */ -+/* #undef JS_HAVE_ENDIAN_H */ -+ -+/* Define to 1 if the <machine/endian.h> header is present and -+ useable. See jscpucfg.h. */ -+#define JS_HAVE_MACHINE_ENDIAN_H 1 -+ -+/* Define to 1 if the <sys/isa_defs.h> header is present and -+ useable. See jscpucfg.h. */ -+/* #undef JS_HAVE_SYS_ISA_DEFS_H */ -+ -+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */ -+/* #undef JS_NUNBOX32 */ -+ -+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */ -+#define JS_PUNBOX64 1 -+ -+/* MOZILLA JSAPI version number components */ -+#define MOZJS_MAJOR_VERSION 45 -+#define MOZJS_MINOR_VERSION 8 -+ -+#endif /* js_config_h */ diff --git a/databases/mongodb34/files/patch-src_third__party_wiredtiger_SConscript b/databases/mongodb34/files/patch-src_third__party_wiredtiger_SConscript deleted file mode 100644 index f03d47f69b56..000000000000 --- a/databases/mongodb34/files/patch-src_third__party_wiredtiger_SConscript +++ /dev/null @@ -1,11 +0,0 @@ ---- src/third_party/wiredtiger/SConscript.orig 2017-09-07 19:28:48 UTC -+++ src/third_party/wiredtiger/SConscript -@@ -169,7 +169,7 @@ if useSnappy: - # If not available at runtime, we fall back to software in some cases. - # - # On zSeries we may disable because SLES 11 kernel doe not support the instructions. --if not (env['TARGET_ARCH'] == 's390x' and get_option("use-s390x-crc32") == "off"): -+if not (env['TARGET_ARCH'] == 's390x' and get_option("use-s390x-crc32") == "off") and not (env['TARGET_ARCH'] == 'aarch64'): - env.Append(CPPDEFINES=["HAVE_CRC32_HARDWARE"]) - - wtlib = env.Library( |