Date: Sun, 7 Jun 2020 09:50:03 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538150 - in head/databases: . mongodb36 mongodb40 mongodb42 mongodb42/files mongodb42/files/aarch64 Message-ID: <202006070950.0579o3Jf054369@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Jun 7 09:50:02 2020 New Revision: 538150 URL: https://svnweb.freebsd.org/changeset/ports/538150 Log: New port: databases/mongodb42 Mongo (from "humongous") is a high-performance, open source, schema-free, document-oriented database. A common name in the "NOSQL" community. WWW: https://www.mongodb.com/ PR: 242002 Submitted by: Ronald Klop <ronald-lists@klop.ws> Reviewed by: koobs, mikael Relnotes: https://docs.mongodb.com/manual/release-notes/4.2/ Added: head/databases/mongodb42/ - copied from r537173, head/databases/mongodb40/ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h (contents, props changed) head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h (contents, props changed) Deleted: head/databases/mongodb42/files/patch-asio-libc++7 Modified: head/databases/Makefile head/databases/mongodb36/Makefile head/databases/mongodb40/Makefile head/databases/mongodb42/Makefile head/databases/mongodb42/distinfo head/databases/mongodb42/files/patch-SConstruct head/databases/mongodb42/files/patch-rpm_mongod.conf Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sun Jun 7 09:32:54 2020 (r538149) +++ head/databases/Makefile Sun Jun 7 09:50:02 2020 (r538150) @@ -188,6 +188,7 @@ SUBDIR += mongodb36-tools SUBDIR += mongodb40 SUBDIR += mongodb40-tools + SUBDIR += mongodb42 SUBDIR += mroonga SUBDIR += mtools-mongodb SUBDIR += mtop Modified: head/databases/mongodb36/Makefile ============================================================================== --- head/databases/mongodb36/Makefile Sun Jun 7 09:32:54 2020 (r538149) +++ head/databases/mongodb36/Makefile Sun Jun 7 09:50:02 2020 (r538150) @@ -31,7 +31,7 @@ USES= compiler:c++14-lang cpe python:2.7,build scons: USE_RC_SUBR= mongod CONFLICTS_BUILD= mongo-cxx-driver -CONFLICTS_INSTALL= mongodb34 mongodb40 +CONFLICTS_INSTALL= mongodb34 mongodb4[02] SHEBANG_FILES= src/mongo/installer/compass/install_compass.in python_OLD_CMD= @python_interpreter@ Modified: head/databases/mongodb40/Makefile ============================================================================== --- head/databases/mongodb40/Makefile Sun Jun 7 09:32:54 2020 (r538149) +++ head/databases/mongodb40/Makefile Sun Jun 7 09:50:02 2020 (r538150) @@ -34,7 +34,7 @@ USES= compiler:c++14-lang cpe python:2.7,build scons: USE_RC_SUBR= mongod CONFLICTS_BUILD= mongo-cxx-driver -CONFLICTS_INSTALL= mongodb3[46] +CONFLICTS_INSTALL= mongodb3[46] mongodb42 SHEBANG_FILES= src/mongo/installer/compass/install_compass.in python_OLD_CMD= @python_interpreter@ Modified: head/databases/mongodb42/Makefile ============================================================================== --- head/databases/mongodb40/Makefile Sun May 31 15:33:36 2020 (r537173) +++ head/databases/mongodb42/Makefile Sun Jun 7 09:50:02 2020 (r538150) @@ -2,63 +2,72 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 4.0.12 -PORTREVISION= 1 +DISTVERSION= 4.2.7 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ \ http://download.mongodb.org/src/ -PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} +PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION} -MAINTAINER= dev.ashevchuk@gmail.com -COMMENT= Distributed document-oriented "NoSQL" database +MAINTAINER= ronald-lists@klop.ws +COMMENT= Distributed document-oriented "NoSQL" database (4.2.x Branch) -# mongodb is AGPLv3, C++ driver is APACHE20 -LICENSE= AGPLv3 APACHE20 +# mongodb is SSPL, C++ driver is APACHE20 +LICENSE= SSPL APACHE20 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64 and aarch64 (i386 deprecated in v3)" -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \ ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${LOCALBASE}/bin/ar:devel/binutils LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ libsnappy.so:archivers/snappy -USES= compiler:c++14-lang cpe python:2.7,build scons:python2 shebangfix +USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix USE_RC_SUBR= mongod +LICENSE_FILE_SSPL= ${WRKSRC}/LICENSE-Community.txt +LICENSE_NAME_SSPL= Server Side Public License +LICENSE_PERMS_SSPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + CONFLICTS_BUILD= mongo-cxx-driver -CONFLICTS_INSTALL= mongodb3[46] +CONFLICTS_INSTALL= mongodb3[46] mongodb40 +OPTIONS_DEFINE= SASL SSL +OPTIONS_DEFAULT=SASL SSL + SHEBANG_FILES= src/mongo/installer/compass/install_compass.in python_OLD_CMD= @python_interpreter@ MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ - --use-system-pcre --use-system-snappy \ - --use-system-boost --use-system-zlib \ - --cxx-std=14 --libc++ \ + --use-system-zlib \ + --use-system-pcre \ + --use-system-snappy \ + --use-system-boost \ + --libc++ \ + --cxx-std=17 \ --runtime-hardening=on \ + -j ${MAKE_JOBS_NUMBER} \ --disable-warnings-as-errors \ - VERBOSE=on AR=${PREFIX}/bin/ar + VERBOSE=on \ + AR=${PREFIX}/bin/ar USERS= mongodb GROUPS= mongodb -OPTIONS_DEFINE= SASL SSL -OPTIONS_DEFAULT= SASL SSL - SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client SSL_USES= ssl SSL_MAKE_ARGS= --ssl -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" @@ -82,4 +91,4 @@ post-install: .endfor ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/databases/mongodb42/distinfo ============================================================================== --- head/databases/mongodb40/distinfo Sun May 31 15:33:36 2020 (r537173) +++ head/databases/mongodb42/distinfo Sun Jun 7 09:50:02 2020 (r538150) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570817575 -SHA256 (mongodb-src-r4.0.12.tar.gz) = 2132def2478c7d45b028a9b79db346a19f9c56f456b52c0ff243982c89c20dc9 -SIZE (mongodb-src-r4.0.12.tar.gz) = 49937644 +TIMESTAMP = 1590586230 +SHA256 (mongodb-src-r4.2.7.tar.gz) = 5bafe1fde358df786aa461cf35eeb90f14793e4e167985c9ff9be53009cfeb2e +SIZE (mongodb-src-r4.2.7.tar.gz) = 61727123 Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,24 @@ +--- src/third_party/mozjs-60/gen-config.sh.orig 2019-10-11 03:28:57 UTC ++++ src/third_party/mozjs-60/gen-config.sh +@@ -28,6 +28,9 @@ _xcode_setup() { + } + + case "$_Path" in ++ "platform/aarch64/freebsd") ++ _CONFIG_OPTS="--host=aarch64-freebsd" ++ ;; + "platform/aarch64/linux") + _CONFIG_OPTS="--host=aarch64-linux" + ;; +@@ -82,9 +85,9 @@ esac + cd mozilla-release/js/src + rm config.cache || true + +-PYTHON=python ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS" ++PYTHON=python2.7 ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS" + +-make recurse_export ++gmake recurse_export + + cd ../../.. + Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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/DataViewObject.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "builtin/DataViewObject.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/DataViewObject.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/JSON.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "builtin/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 "builtin/JSON.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 ++#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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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/Promise.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "builtin/Promise.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/Promise.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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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/AliasAnalysisShared.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/AliasAnalysisShared.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/AliasAnalysisShared.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 ++#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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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/BaselineCacheIRCompiler.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/BaselineCacheIRCompiler.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/BaselineCacheIRCompiler.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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.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/CacheIR.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/CacheIR.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/CacheIR.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif ++#include "jit/CacheIRCompiler.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/CacheIRCompiler.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/CacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif ++#include "jit/CacheIRSpewer.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/CacheIRSpewer.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/CacheIRSpewer.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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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 ++#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/FlowAliasAnalysis.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/FlowAliasAnalysis.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/FlowAliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#include "jit/FoldLinearArithConstants.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/FoldLinearArithConstants.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/FoldLinearArithConstants.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 ++#include "jit/IonCacheIRCompiler.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/IonCacheIRCompiler.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/IonCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#include "jit/IonControlFlow.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/IonControlFlow.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/IonControlFlow.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif ++#include "jit/IonIC.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/IonIC.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/IonIC.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/JSJitFrameIter.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/JSJitFrameIter.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/JSJitFrameIter.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/Jit.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/Jit.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/Jit.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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 ++#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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#include "jit/Linker.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "jit/Linker.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/Linker.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 ++#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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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 ++#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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#include "builtin/Stream.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "builtin/Stream.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/Stream.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif ++#include "builtin/String.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "builtin/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 "builtin/String.cpp defines INITGUID, so it cannot be built in unified mode." ++#undef INITGUID ++#endif ++#include "builtin/Symbol.cpp" ++#ifdef PL_ARENA_CONST_ALIGN_MASK ++#error "builtin/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 "builtin/Symbol.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 +\ No newline at end of file Added: head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp Sun Jun 7 09:50:02 2020 (r538150) @@ -0,0 +1,59 @@ +--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig 2019-11-14 10:50:10 UTC ++++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp +@@ -0,0 +1,55 @@ ++#define MOZ_UNIFIED_BUILD ++#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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006070950.0579o3Jf054369>