From nobody Tue Aug 15 10:03:08 2023 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 4RQ6K91Dynz4Tmpn; Tue, 15 Aug 2023 10:03:09 +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 4RQ6K85hjqz3G0w; Tue, 15 Aug 2023 10:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692093788; 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=Lis7w8EraNw4Zxsr2NwI/4Cf/KWMinsN39IKqIK833U=; b=oYiV+LBp0L0L0TDkyQl3zOW01APSzzM/sAmpNe4o4wCz0zVQHhB2fxE2EYNgCY1sfS+NCD zvWOeW7yURrHr9CICuUo8JBw6+EfO3d3xlOwJvLacM9yir9y5c3s+oUtLAZokcP0Etf53l 2sZizK4mAgDYNgp++VcbKwRowxFvM106J+0wCwi9Q/3CX2zhOBX5qIlO6VXPFB+eaB2uaS eRbeB3hGpeZ1RCXYEmh0K1Yz3IkcsoOSpO5cDnnV6v7wIHvoEr3EgBAY9+1Sa+rXSGL5kf yN1+zVjzsqakAseBRKFhC06e4784CpV0f0oHn14DApJu5o/oFxxSBMg62Wq1RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692093788; 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=Lis7w8EraNw4Zxsr2NwI/4Cf/KWMinsN39IKqIK833U=; b=RQrqgPEpXW68BwGyhF/jaVz04oJVYV0QNaG0d3s0Emb522Q5ljel6WFFDebGOB8v6tElKJ A0xE2pGv8ThdMah2hLLTs6Yte5lOVUduBok3k/xavznGJIiaE4p1Ruz9iFQG/YlCu3+fin C1OFmXE+GSSw3b+MyGCdiT5zWDmznsTKVxT7DUuCT8tQ4sBUN5qRgwO4eo353JWyPbqzmp tEaoDkPMTv0OvMGXknBXxxk91vEIRUrEoOuvoRIC0DULC+VteOzhggG2k9RNCJNoZW7JHF HDS3/i8yyvVy9bOW0uD1xuBA8zvxW9J6AZcg7KzMdiYD5F/18jkQBXQwTzmRcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692093788; a=rsa-sha256; cv=none; b=n1EOhx/1j4yFdYlUT6sbX9uXlBB5rKvh5ixwRZ7ywUcOQJFG4NQnUg5+VWDWraik+wyDyD miGtTfXHdQ469YeEXDQroxwjnA9BN0RNeLq7xDVs8T7W5oyt4a3reWW5rKGujLgFSsZQpN 4Oi2XW270qg0+vp4liIjMR2LZ1dfvVoYkNwDUVEue7PnY9P6uneTXGLIxJEXgOOKXe9HjN xpQqmU9Ygb9+n1dLLo1auIaisRRiRWuEmM6wUnx9GKDOMw/BdeazAX1A5zcmhr+KmOS008 IMcQf9lNwg03SP3qYeyZIi1RE9DbxoNveslOkMwoCWCem16DChHt8jOmJJ6w2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQ6K84npmz15S3; Tue, 15 Aug 2023 10:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FA38oM075916; Tue, 15 Aug 2023 10:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FA38jV075913; Tue, 15 Aug 2023 10:03:08 GMT (envelope-from git) Date: Tue, 15 Aug 2023 10:03:08 GMT Message-Id: <202308151003.37FA38jV075913@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: 32bbdaf1f437 - main - databases/mongodb70: update to 7.0.0 release 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: 32bbdaf1f437cc55439136d17ea1368f912e03f3 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=32bbdaf1f437cc55439136d17ea1368f912e03f3 commit 32bbdaf1f437cc55439136d17ea1368f912e03f3 Author: Ronald Klop AuthorDate: 2023-08-15 09:56:07 +0000 Commit: Ronald Klop CommitDate: 2023-08-15 10:02:53 +0000 databases/mongodb70: update to 7.0.0 release Changes: https://www.mongodb.com/docs/v7.0/release-notes/7.0/ * version bump * new option ARMV80A to support older ARM cpus like Raspberry Pi 4 * pet portclippy and portfmt * poudriere stage-qa: ok As upstream has stopped supporting non-LSE ARM cpus I'm adapting the port also. The option ARMV80A is for backwards compatibility, but use at your own risk. See pkg-message for more info. --- databases/mongodb70/Makefile | 15 +++++++++++---- databases/mongodb70/distinfo | 6 +++--- databases/mongodb70/files/extrapatch-SConstruct | 16 ++++++++++++++++ databases/mongodb70/files/patch-SConstruct | 14 -------------- databases/mongodb70/pkg-message | 3 ++- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index a58c1a2426c6..48a879949ed5 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,6 +1,6 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 7.0.0-rc10 +DISTVERSION= 7.0.0 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} @@ -25,7 +25,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} # 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= libcurl.so:ftp/curl \ +LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre2-8.so:devel/pcre2 \ libsnappy.so:archivers/snappy \ libstemmer.so:textproc/snowballstemmer \ @@ -49,10 +49,10 @@ USE_RC_SUBR= mongod SHEBANG_FILES= buildscripts/scons.py python_OLD_CMD= @python_interpreter@ -MAKE_ARGS= --cxx-std=20 \ +MAKE_ARGS= --allocator=system \ + --cxx-std=20 \ --disable-warnings-as-errors \ --libc++ \ - --allocator=system \ --runtime-hardening=on \ --use-system-libunwind \ --use-system-pcre2 \ @@ -74,10 +74,17 @@ USERS= mongodb GROUPS= mongodb OPTIONS_DEFINE= LTO SASL SSL NOAVX +OPTIONS_DEFINE_aarch64= ARMV80A OPTIONS_DEFAULT= LTO SASL SSL +# MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream. +# Can give corruption on high concurrency. +# Please read https://jira.mongodb.org/browse/SERVER-71772. +ARMV80A_DESC= Enable non-LSE ARM64 CPUs like RPI4. NOAVX_DESC= "Disable AVX instructions on amd64 (Sandybridge+)" +ARMV80A_EXTRA_PATCHES= ${FILESDIR}/extrapatch-SConstruct + LTO_MAKE_ARGS= --lto=on NOAVX_MAKE_ARGS= --experimental-optimization="-sandybridge" diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo index dd9d38b66a35..cee89957d4f2 100644 --- a/databases/mongodb70/distinfo +++ b/databases/mongodb70/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1690478790 -SHA256 (mongodb-mongo-r7.0.0-rc10_GH0.tar.gz) = ea5c1cce1c58dcfc802c28ce3df34eb56db0d826f90a4fe3f13337902073887b -SIZE (mongodb-mongo-r7.0.0-rc10_GH0.tar.gz) = 113471282 +TIMESTAMP = 1691085993 +SHA256 (mongodb-mongo-r7.0.0_GH0.tar.gz) = 922460d4eafcb3f7cc2a0bfc3d77422ed1a3a6c665826a2ed7609efd598820f1 +SIZE (mongodb-mongo-r7.0.0_GH0.tar.gz) = 113448068 SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0 SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901 diff --git a/databases/mongodb70/files/extrapatch-SConstruct b/databases/mongodb70/files/extrapatch-SConstruct new file mode 100644 index 000000000000..05946bd82cdc --- /dev/null +++ b/databases/mongodb70/files/extrapatch-SConstruct @@ -0,0 +1,16 @@ +--- SConstruct.orig 2023-06-07 17:07:38 UTC ++++ SConstruct +@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too + # setting it for both C and C++ by setting both of CFLAGS and + # CXXFLAGS. + ++ arm_march_flag = "armv8-a" ++ if get_option('use-hardware-crc32') == "on": ++ arm_march_flag += "+crc" ++ + default_targeting_flags_for_architecture = { +- "aarch64": {"-march=": "armv8.2-a", "-mtune=": "generic"}, ++ "aarch64": {"-march=": arm_march_flag, "-mtune=": "generic"}, + "i386": {"-march=": "nocona", "-mtune=": "generic"}, + "ppc64le": {"-mcpu=": "power8", "-mtune=": "power8", "-mcmodel=": "medium"}, + "s390x": {"-march=": "z196", "-mtune=": "zEC12"}, diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct index b5998fcb4a52..a6da48e57114 100644 --- a/databases/mongodb70/files/patch-SConstruct +++ b/databases/mongodb70/files/patch-SConstruct @@ -55,17 +55,3 @@ "-Wall", "-Wsign-compare", "-Wno-unknown-pragmas", -@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too - # setting it for both C and C++ by setting both of CFLAGS and - # CXXFLAGS. - -+ arm_march_flag = "armv8-a" -+ if get_option('use-hardware-crc32') == "on": -+ arm_march_flag += "+crc" -+ - default_targeting_flags_for_architecture = { -- "aarch64": {"-march=": "armv8.2-a", "-mtune=": "generic"}, -+ "aarch64": {"-march=": arm_march_flag, "-mtune=": "generic"}, - "i386": {"-march=": "nocona", "-mtune=": "generic"}, - "ppc64le": {"-mcpu=": "power8", "-mtune=": "power8", "-mcmodel=": "medium"}, - "s390x": {"-march=": "z196", "-mtune=": "zEC12"}, diff --git a/databases/mongodb70/pkg-message b/databases/mongodb70/pkg-message index e0a343760e63..53d27f877b5a 100644 --- a/databases/mongodb70/pkg-message +++ b/databases/mongodb70/pkg-message @@ -2,7 +2,8 @@ { type: install message: <