git: 2dbe4cb866c9 - main - databases/mongodb[78]0: fix NOAVX option

The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2dbe4cb866c9380901bf81d0a939a78a731e64b7

commit 2dbe4cb866c9380901bf81d0a939a78a731e64b7
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2024-11-02 07:52:02 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2024-11-02 07:55:54 +0000

    databases/mongodb[78]0: fix NOAVX option
    
    bump portrevision as it did build but generated broken executables
    piggyback a small portlint pacifier
    
    PR:     282471
---
 databases/mongodb70/Makefile                                  |  6 ++++--
 .../files/extrapatch-src_third__party_mozjs_SConscript        | 11 +++++++++++
 databases/mongodb80/Makefile                                  |  2 ++
 .../files/extrapatch-src_third__party_mozjs_SConscript        | 11 +++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
index 68707fd1a4dc..bfa233b6b6f8 100644
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	7.0.14
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
@@ -100,6 +101,7 @@ ARMV80A_EXTRA_PATCHES=	${FILESDIR}/extrapatch-SConstruct
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
+NOAVX_EXTRA_PATCHES=	${FILESDIR}/extrapatch-src_third__party_mozjs_SConscript
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
@@ -136,8 +138,8 @@ post-patch:
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
 
 pre-configure:
-	# Verify we downloaded the proper mozjs git tag.
-	sh -c "test \"X`grep -E '^LIB_GIT_REVISION=' ${WRKSRC}/src/third_party/mozjs/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\""
+# Verify we downloaded the proper mozjs git tag.
+	${SH} -c "test \"X`grep -E '^LIB_GIT_REVISION=' ${WRKSRC}/src/third_party/mozjs/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\""
 
 do-configure:
 # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
diff --git a/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript b/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript
new file mode 100644
index 000000000000..4370f13323a4
--- /dev/null
+++ b/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript
@@ -0,0 +1,11 @@
+--- src/third_party/mozjs/SConscript.orig	2024-08-14 20:38:09 UTC
++++ src/third_party/mozjs/SConscript
+@@ -144,7 +145,7 @@ sources = [
+     "extract/js/src/wasm/WasmCode-platform.cpp",
+ ]
+ 
+-if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
++if False and env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
+     env.Append(CCFLAGS=['-mavx2'])
+     sources.extend(["extract/mozglue/misc/SIMD_avx2.cpp", "extract/mozglue/misc/SSE.cpp"])
+ 
diff --git a/databases/mongodb80/Makefile b/databases/mongodb80/Makefile
index 7feef28922a3..549bd025c7df 100644
--- a/databases/mongodb80/Makefile
+++ b/databases/mongodb80/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	8.0.1
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
@@ -105,6 +106,7 @@ ARMV80A_EXTRA_PATCHES=	${FILESDIR}/extrapatch-SConstruct
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
+NOAVX_EXTRA_PATCHES=	${FILESDIR}/extrapatch-src_third__party_mozjs_SConscript
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
diff --git a/databases/mongodb80/files/extrapatch-src_third__party_mozjs_SConscript b/databases/mongodb80/files/extrapatch-src_third__party_mozjs_SConscript
new file mode 100644
index 000000000000..4370f13323a4
--- /dev/null
+++ b/databases/mongodb80/files/extrapatch-src_third__party_mozjs_SConscript
@@ -0,0 +1,11 @@
+--- src/third_party/mozjs/SConscript.orig	2024-08-14 20:38:09 UTC
++++ src/third_party/mozjs/SConscript
+@@ -144,7 +145,7 @@ sources = [
+     "extract/js/src/wasm/WasmCode-platform.cpp",
+ ]
+ 
+-if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
++if False and env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
+     env.Append(CCFLAGS=['-mavx2'])
+     sources.extend(["extract/mozglue/misc/SIMD_avx2.cpp", "extract/mozglue/misc/SSE.cpp"])
+