From nobody Wed Oct 26 16:20:45 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MyDZ56Gvkz4gYWF; Wed, 26 Oct 2022 16:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MyDZ560gBz3W8S; Wed, 26 Oct 2022 16:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666801245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eFACAdhPpyQ6c17Tb06CPpYM+qJIjZW8tMkqHhzfR5A=; b=fPik+LdO4jiUY+qHeCTgIFDoeYNs2n59t4HrDOf2gzE06tWtKzJEmRG3baHvhpyIxc48g1 w7cMcinUOnuruKQTgg9gWtY3tbmYo49xYMQ+a61ADCFw+rZYCOU2/j8UP6kmrAyd/biVVC +dBHJMzO1UvSUVZLj7MHOKNH7Uxait3WrAKhlbTX1g4VkBhHN2cwLDXqyfWQToqronCqsR oEMa7wl40jskfEGbqh4e6kNMoBtVp+V+JCQwXcvvqKo813+siFhCfYuAsLCYdniC1X4z3g NRHASuxGvjA/Al12ucH/c6dIT3xP/vyhjXG09b8sjTaFcs1g3eqX04WEclw+HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MyDZ553VnzNP2; Wed, 26 Oct 2022 16:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29QGKjMW049593; Wed, 26 Oct 2022 16:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29QGKjeI049592; Wed, 26 Oct 2022 16:20:45 GMT (envelope-from git) Date: Wed, 26 Oct 2022 16:20:45 GMT Message-Id: <202210261620.29QGKjeI049592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: cbde7a63952d - main - databases/mongodb60: update to 6.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbde7a63952df7113308e7e2ea2a0a1fec056719 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666801245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eFACAdhPpyQ6c17Tb06CPpYM+qJIjZW8tMkqHhzfR5A=; b=UsUkUN2rWWJ9yQeuwFSlsFO8EzQSkQQoPiUEAuaicY9NtsgjPDOpTKsisETVBIrcVKug43 /MxTiEhBpFE12N/10/EP4qk01HBaUqRgZM1E9egV7lgxu/o0/Y1wtBfxwrmoVcuIsVANfC o/j1SnX2uyleM0qdmW/h7zaoTnGiUSWdeg1/rJU+k+9w/Ukd27lyLYfJ7s5a7LWAYCopjP 2L39qjVJxdUzn8084Vk20+C5+M9DyLU5pgMCOo/+5juGpVUtu0XXbTdDtgup+tJfLan1P6 R+kxkw/LaCOH8fNUsveyu7j+XeidHcsoCXWXV5s0zNaO0qE7r4W8ZFkmXJSMLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666801245; a=rsa-sha256; cv=none; b=MSOZibKWaqwGgqrBAp4uvHc7vvihnSzsS9jGMZjXYnKkcRiehDDcoS3ea57v1tu1N6tU4j 65BfUGIE4KAykmhIZNQlQA8RPs9JT0SgKkManI6GRukqy9WgyGgcOrQB9un7rlIuNGz6lP BJhxT96NK3ThKfoaZGKbTzREZ1GT23byCpfSL65cjolAWtf5t2adVPAbWqi4X7wRlSEG7Y Ai3yva8OHMXlsRvtrt5AQ8iAGRyQbsoZ7d2JmUeMvM6TOGRMvVsHrgqg+kdcIioxWRvvvD z9Qg+s+oggK55oQqR5CJ/PVGbcsTEVZoe/XVketNvl0q3R8bhnvn6baEXeu4Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbde7a63952df7113308e7e2ea2a0a1fec056719 commit cbde7a63952df7113308e7e2ea2a0a1fec056719 Author: Ronald Klop AuthorDate: 2022-10-25 10:20:00 +0000 Commit: Ronald Klop CommitDate: 2022-10-26 16:18:34 +0000 databases/mongodb60: update to 6.0.2 Summary: - automate mozjs configuration - enables powerpc64le support - overwrites the upstream amd64 configuration which fixes the build - removes almost 1 MB of patches for aarch64 - use more system libs and llvm-ar (thanks to dizzy@) - Fix removal of (lib)zstd/zstandard directory which fixes the build on all supported platforms - change my maintainer email to @FreeBSD.org changes: https://www.mongodb.com/docs/manual/release-notes/6.0/#6.0.2---sep-28--2022 PR: 266587 Tested by: dizzy (libs), pkubaj (powerpc64le) Approved by: pkubaj (mentor), rene (mentor) Co-Authored-By: dizzy, pkubaj Differential Revision: https://reviews.freebsd.org/D37130 --- databases/mongodb60/Makefile | 93 +- databases/mongodb60/distinfo | 8 +- ...arch64_freebsd_build_Unified__cpp__js__src0.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src1.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src10.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src11.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src12.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src13.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src14.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src15.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src16.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src17.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src18.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src19.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src2.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src20.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src21.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src22.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src23.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src24.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src25.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src26.cpp | 59 - ...rch64_freebsd_build_Unified__cpp__js__src27.cpp | 41 - ...arch64_freebsd_build_Unified__cpp__js__src3.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src4.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src5.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src6.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src7.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src8.cpp | 59 - ...arch64_freebsd_build_Unified__cpp__js__src9.cpp | 59 - ...d_debugger_Unified__cpp__js__src__debugger0.cpp | 59 - ...d_debugger_Unified__cpp__js__src__debugger1.cpp | 32 - ...d_frontend_Unified__cpp__js__src__frontend0.cpp | 59 - ...d_frontend_Unified__cpp__js__src__frontend1.cpp | 59 - ...d_frontend_Unified__cpp__js__src__frontend2.cpp | 59 - ...d_frontend_Unified__cpp__js__src__frontend3.cpp | 59 - ...d_frontend_Unified__cpp__js__src__frontend4.cpp | 59 - ...d_frontend_Unified__cpp__js__src__frontend5.cpp | 59 - ...d_frontend_Unified__cpp__js__src__frontend6.cpp | 59 - ...freebsd_build_gc_Unified__cpp__js__src__gc0.cpp | 59 - ...freebsd_build_gc_Unified__cpp__js__src__gc1.cpp | 59 - ...freebsd_build_gc_Unified__cpp__js__src__gc2.cpp | 59 - ...freebsd_build_gc_Unified__cpp__js__src__gc3.cpp | 14 - ...d_irregexp_Unified__cpp__js__src__irregexp0.cpp | 59 - ...d_irregexp_Unified__cpp__js__src__irregexp1.cpp | 59 - ...d_irregexp_Unified__cpp__js__src__irregexp2.cpp | 23 - ...eebsd_build_jit_Unified__cpp__js__src__jit0.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit1.cpp | 59 - ...ebsd_build_jit_Unified__cpp__js__src__jit10.cpp | 59 - ...ebsd_build_jit_Unified__cpp__js__src__jit11.cpp | 59 - ...ebsd_build_jit_Unified__cpp__js__src__jit12.cpp | 59 - ...ebsd_build_jit_Unified__cpp__js__src__jit13.cpp | 59 - ...ebsd_build_jit_Unified__cpp__js__src__jit14.cpp | 59 - ...ebsd_build_jit_Unified__cpp__js__src__jit15.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit2.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit3.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit4.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit5.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit6.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit7.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit8.cpp | 59 - ...eebsd_build_jit_Unified__cpp__js__src__jit9.cpp | 59 - ...js_platform_aarch64_freebsd_build_js-confdefs.h | 85 - ...bsd_build_wasm_Unified__cpp__js__src__wasm0.cpp | 59 - ...bsd_build_wasm_Unified__cpp__js__src__wasm1.cpp | 59 - ...bsd_build_wasm_Unified__cpp__js__src__wasm2.cpp | 59 - ...bsd_build_wasm_Unified__cpp__js__src__wasm3.cpp | 59 - ...bsd_build_wasm_Unified__cpp__js__src__wasm4.cpp | 59 - ...eebsd_include_frontend_ReservedWordsGenerated.h | 363 - ...rch64_freebsd_include_gc_StatsPhasesGenerated.h | 193 - ...rch64_freebsd_include_jit_CacheIROpsGenerated.h | 12512 ------------------- ...aarch64_freebsd_include_jit_LOpcodesGenerated.h | 571 - ...m_aarch64_freebsd_include_jit_MIROpsGenerated.h | 2662 ---- ..._platform_aarch64_freebsd_include_js-confdefs.h | 85 - ...js_platform_aarch64_freebsd_include_js-config.h | 80 - ...atform_aarch64_freebsd_include_selfhosted.out.h | 22 - databases/mongodb60/files/patch-SConstruct | 14 +- databases/mongodb60/files/patch-boost179-link-fix | 21 + .../files/patch-boost179-system-compat-fix | 108 + .../files/patch-src_mongo_db_fts_stemmer.h | 11 + 80 files changed, 222 insertions(+), 20315 deletions(-) diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile index 6a02d314ba2d..e5aa17b5de94 100644 --- a/databases/mongodb60/Makefile +++ b/databases/mongodb60/Makefile @@ -1,10 +1,10 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 6.0.1 +DISTVERSION= 6.0.2 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} -MAINTAINER= ronald-lists@klop.ws +MAINTAINER= ronald@FreeBSD.org COMMENT= Distributed document-oriented "NoSQL" database (6.0.x Branch) WWW= https://docs.mongodb.com/v6.0/ @@ -14,48 +14,69 @@ LICENSE_NAME_SSPLv1= Server Side Public License Version 1 LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -ONLY_FOR_ARCHS= aarch64 amd64 -ONLY_FOR_ARCHS_REASON= only ported to amd64 and aarch64 on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64 +ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le +ONLY_FOR_ARCHS_REASON= only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64 -BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ - ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} -LIB_DEPENDS= libcurl.so:ftp/curl \ +# build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh +BUILD_DEPENDS+= autoconf2.13:devel/autoconf2.13 \ + gsed:textproc/gsed +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libcurl.so:ftp/curl \ + libicuuc.so:devel/icu \ + libunwind.so:devel/libunwind \ libpcre.so:devel/pcre \ - libsnappy.so:archivers/snappy + libsnappy.so:archivers/snappy \ + libstemmer.so:textproc/snowballstemmer \ + libyaml-cpp.so:devel/yaml-cpp \ + libzstd.so:archivers/zstd + +USES= compiler:c++17-lang cpe python:build scons shebangfix +# gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh +USES+= gmake pkgconfig + +# mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh +MOZJS_TAG= 82aac6af18abcd5bf188afbc821779ccb0ca0902 -USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix USE_GITHUB= yes -GH_ACCOUNT= mongodb -GH_PROJECT= mongo +GH_ACCOUNT= mongodb mongodb-forks:mozjs +GH_PROJECT= mongo spidermonkey:mozjs +GH_TAGNAME= ${MOZJS_TAG}:mozjs USE_RC_SUBR= mongod SHEBANG_FILES= buildscripts/scons.py python_OLD_CMD= @python_interpreter@ -CONFLICTS_INSTALL= mongodb[0-9][0-9] - -USERS= mongodb -GROUPS= mongodb - -OPTIONS_DEFINE= LTO SASL SSL -OPTIONS_DEFAULT= LTO SASL SSL - MAKE_ARGS= --cxx-std=17 \ --disable-warnings-as-errors \ --libc++ \ --runtime-hardening=on \ + --use-system-boost \ + --use-system-icu \ + --use-system-libunwind \ --use-system-pcre \ --use-system-snappy \ + --use-system-stemmer \ + --use-system-yaml \ --use-system-zlib \ + --use-system-zstd \ -j ${MAKE_JOBS_NUMBER} \ - AR=${PREFIX}/bin/ar \ + AR=llvm-ar \ MONGO_VERSION=${DISTVERSION} \ VERBOSE=on +CONFLICTS_INSTALL= mongodb[0-9][0-9] + +USERS= mongodb +GROUPS= mongodb + +OPTIONS_DEFINE= LTO SASL SSL +OPTIONS_DEFAULT= LTO SASL SSL + LTO_MAKE_ARGS= --lto=on SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -66,10 +87,6 @@ SSL_MAKE_ARGS= --ssl .include -.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le -EXTRA_PATCHES= ${FILESDIR}/${ARCH} -.endif - ALL_TARGET= install-core # This ports is only following the Major Release. @@ -78,8 +95,32 @@ PORTSCOUT= limit:^6\.0\. CPE_PRODUCT= mongodb -#pre-patch: -# ${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S +.if ${ARCH} == amd64 +MOZJS_ARCH=x86_64 +.elif ${ARCH} == powerpc64le +MOZJS_ARCH=ppc64le +.elif ${ARCH} == aarch64 +MOZJS_ARCH=${ARCH} +.else +.error Unsupport architecture "${ARCH}" +.endif + +post-patch: + ${RM} -rf ${WRKSRC}/src/third_party/boost + ${RM} -rf ${WRKSRC}/src/third_party/icu4c-* + ${RM} -rf ${WRKSRC}/src/third_party/pcre-* + ${RM} -rf ${WRKSRC}/src/third_party/snappy-* + ${RM} -rf ${WRKSRC}/src/third_party/libstemmer_c + ${RM} -rf ${WRKSRC}/src/third_party/unwind + ${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp + ${RM} -rf ${WRKSRC}/src/third_party/zlib-* + ${RM} -rf ${WRKSRC}/src/third_party/zstandard + +do-configure: + # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh + ${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release + cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13 + cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd do-build: ${WRKSRC}/buildscripts/scons.py -C ${WRKSRC} ${MAKE_ARGS} diff --git a/databases/mongodb60/distinfo b/databases/mongodb60/distinfo index b1ae09f8b522..46ef7a384f74 100644 --- a/databases/mongodb60/distinfo +++ b/databases/mongodb60/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1662628894 -SHA256 (mongodb-mongo-r6.0.1_GH0.tar.gz) = 8b6ed047a61b6172756810c906b2b182761f6c55c8ac34c9a60f41347f1659aa -SIZE (mongodb-mongo-r6.0.1_GH0.tar.gz) = 90452293 +TIMESTAMP = 1664434467 +SHA256 (mongodb-mongo-r6.0.2_GH0.tar.gz) = 4a89b1bfe6e85f7b39fa65576d99d5d87bf6edf4742d3e732f69882e442c6e46 +SIZE (mongodb-mongo-r6.0.2_GH0.tar.gz) = 90500172 +SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0 +SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901 diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp deleted file mode 100644 index de6b6df13358..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "builtin/Array.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Array.cpp 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/Array.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/BigInt.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/BigInt.cpp 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/BigInt.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "builtin/Boolean.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/Boolean.cpp 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/Boolean.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 -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp deleted file mode 100644 index b9a68c835e01..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "builtin/FinalizationRegistryObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "builtin/FinalizationRegistryObject.cpp 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/FinalizationRegistryObject.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 -+#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 -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp deleted file mode 100644 index 3f7df1be215f..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#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 "threading/Mutex.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "threading/Mutex.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "threading/Mutex.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "threading/ProtectedData.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "threading/ProtectedData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "threading/ProtectedData.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "threading/Thread.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "threading/Thread.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "threading/Thread.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "threading/posix/CpuCount.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "threading/posix/CpuCount.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "threading/posix/CpuCount.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "threading/posix/PosixThread.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "threading/posix/PosixThread.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "threading/posix/PosixThread.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp deleted file mode 100644 index 4d59f9a93c33..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "util/AllocPolicy.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/AllocPolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/AllocPolicy.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/AllocationLogging.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/AllocationLogging.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/AllocationLogging.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/CompleteFile.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/CompleteFile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/CompleteFile.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/DumpFunctions.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/DumpFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/DumpFunctions.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/NativeStack.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/NativeStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/NativeStack.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/Printf.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/Printf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/Printf.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp deleted file mode 100644 index 6f980c7f4164..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "util/StringBuffer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/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 "util/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/StructuredSpewer.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/StructuredSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/StructuredSpewer.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/Text.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/Text.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode." -+#undef PL_ARENA_CONST_ALIGN_MASK -+#endif -+#ifdef INITGUID -+#error "util/Text.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "util/Unicode.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "util/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 "util/Unicode.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Activation.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Activation.cpp 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/Activation.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 -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp deleted file mode 100644 index a4d56f9bdd49..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src13.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/ArrayBufferObjectMaybeShared.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ArrayBufferObjectMaybeShared.cpp 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/ArrayBufferObjectMaybeShared.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ArrayBufferViewObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ArrayBufferViewObject.cpp 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/ArrayBufferViewObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/AsyncFunction.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/AsyncFunction.cpp 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/AsyncFunction.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/AsyncIteration.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/AsyncIteration.cpp 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/AsyncIteration.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/BigIntType.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/BigIntType.cpp 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/BigIntType.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp deleted file mode 100644 index 012acd657845..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/BuildId.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/BuildId.cpp 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/BuildId.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/BuiltinObjectKind.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/BuiltinObjectKind.cpp 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/BuiltinObjectKind.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/BytecodeLocation.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/BytecodeLocation.cpp 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/BytecodeLocation.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/BytecodeUtil.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/BytecodeUtil.cpp 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/BytecodeUtil.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Caches.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Caches.cpp 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/Caches.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 -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp deleted file mode 100644 index a1783dcc5782..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#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/Compartment.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Compartment.cpp 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/Compartment.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/CompilationAndEvaluation.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/CompilationAndEvaluation.cpp 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/CompilationAndEvaluation.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 -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp deleted file mode 100644 index bdd8b279e0e2..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#include "vm/EnvironmentObject.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/EnvironmentObject.cpp 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/EnvironmentObject.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/EqualityOperations.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/EqualityOperations.cpp 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/EqualityOperations.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/ErrorMessages.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ErrorMessages.cpp 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/ErrorMessages.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/ErrorReporting.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/ErrorReporting.cpp 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/ErrorReporting.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Exception.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Exception.cpp 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/Exception.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp deleted file mode 100644 index 3bb547532b04..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#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/FrameIter.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/FrameIter.cpp 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/FrameIter.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/FunctionFlags.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/FunctionFlags.cpp 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/FunctionFlags.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/GeckoProfiler.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/GeckoProfiler.cpp 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/GeckoProfiler.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/GetterSetter.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/GetterSetter.cpp 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/GetterSetter.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -\ No newline at end of file diff --git a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp deleted file mode 100644 index f851a67daf5e..000000000000 --- a/databases/mongodb60/files/aarch64/patch-src_third__party_mozjs_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig 2022-09-08 14:42:13 UTC -+++ src/third_party/mozjs/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp -@@ -0,0 +1,55 @@ -+#define MOZ_UNIFIED_BUILD -+#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 -+#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/Initialization.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/Initialization.cpp 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/Initialization.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/InternalThreadPool.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/InternalThreadPool.cpp 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/InternalThreadPool.cpp defines INITGUID, so it cannot be built in unified mode." -+#undef INITGUID -+#endif -+#include "vm/Iteration.cpp" -+#ifdef PL_ARENA_CONST_ALIGN_MASK -+#error "vm/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 "vm/Iteration.cpp defines INITGUID, so it cannot be built in unified mode." *** 20209 LINES SKIPPED ***