From nobody Sat Nov 02 07:57:27 2024 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 4XgVSl39wQz5c1gt; Sat, 02 Nov 2024 07:57:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XgVSl2ds8z4dVf; Sat, 2 Nov 2024 07:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730534247; 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=pR0iB2zwMxmEzveRa2cqaiJpwep0x8eqPF9KLyJYVH8=; b=IZ4Pa8aLs0QdtSgS4rkfGsNQddqYmAjhLC1SCefqPRktPFDSyRb6JMC0WZfpnwS65KUrmo PmNIOBO2/l5z8FdEhVBP2+oBgaW9YASL6CZbVUow8dIyh/l8ke1jouX4uu8RxVEMT7j63O U9GWn4tfofVZnY8C0HvNNseugftluw568iTQGyV3ZKGBNGs/TGtndZhtkbg5I7pdMiltgR qXUeIx1S9CO+hz6m2euLUoBuZN1AvLR7EOp36iZ2H2zuefmXatt6+XxVCJdjmpUOq384bv iUEyhWygnRiphT+4GMUvV++Effn8Olu36aIGcbAfV6dRsjZ06hYE4KTTjuHJ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730534247; 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=pR0iB2zwMxmEzveRa2cqaiJpwep0x8eqPF9KLyJYVH8=; b=T9R533rNCdHU80Xs2t2nKQRhlBHZ0se6GVH0JjgNnPrWHNDwyy30CW6UkEjGI2Bx4U5emm W9Z1GmG2t3tessHvCCEN2XzEl3cKklhcvoRYdzCnxwrZmmNbnrsRXBs1GMazjxHkg82mKe fhqi45c+o5MNmVpy0AjMRv2RkumJPXxs1/1x6zQIbV6UHBpiJ0HBvyz7hiFkGaKoRE0oeC bEyK6RUIxfp+1kFHYrCKV57pkffR/ddKLX15nCzltkj9oEAWSyDe4dDUgLf3tcS+do7rzw hrZVzg3Cb5/hvivxUQZ4TCvZAYTl3JHc8i2eeLLZdHCUr+PYRi5spbIYV3rRBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730534247; a=rsa-sha256; cv=none; b=gzHyZ6qIh672+ZDuuO8CXlbyO6YAjuY6uS26meiuaGeVfFJa4yWFtEhlP6aAxzx9kp7cLR fOUnr1rDUqejj+9TqoIge6z1grF1CPzv1VkQaYjxzXZSWSy2QpDJpXUfDkHWklPw0I2VTY YYeS7VGgQuyLRINNGl2XQ8VGPK7FhYOSkVU8fkY6+AUfwOx38sHyykSNc7DAngkig4KnuN bE2cizK7TR/tX2ve936jWS+U9hZvtfi7jS2Ep1ggnLJr9Wq68doUG2Y97f3KpEYRhdFhid kw/nY/T+fOKvBpMkKQhVW3zN9sw4GgEwdc6SeVSLs7dnRb0HJ7MkqgLFcBeScw== 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 4XgVSl270dzw6D; Sat, 2 Nov 2024 07:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A27vRC2032422; Sat, 2 Nov 2024 07:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A27vRqn032419; Sat, 2 Nov 2024 07:57:27 GMT (envelope-from git) Date: Sat, 2 Nov 2024 07:57:27 GMT Message-Id: <202411020757.4A27vRqn032419@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: 2dbe4cb866c9 - main - databases/mongodb[78]0: fix NOAVX option 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 2dbe4cb866c9380901bf81d0a939a78a731e64b7 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=2dbe4cb866c9380901bf81d0a939a78a731e64b7 commit 2dbe4cb866c9380901bf81d0a939a78a731e64b7 Author: Ronald Klop AuthorDate: 2024-11-02 07:52:02 +0000 Commit: Ronald Klop 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"]) +