From nobody Wed Nov 13 20:32:23 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 4XpZhl4rGZz5cYVV; Wed, 13 Nov 2024 20:32:23 +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 4XpZhl4Nw1z4MFJ; Wed, 13 Nov 2024 20:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731529943; 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=VcqFGstfyvtJQAGu1eVFo4tGZHh/2Mw4nsd2+U4fMlc=; b=oHKivC8ryU6Dly7Bq9i8fbxXxETeaBU+hAoxcMX99QfsBBdO2/b9QBy+quLUSa9EoAar3+ c2+tnA4LZIclf1JUwvpnKCurJEiarvDX7YuIAnvZ8zzFDF4LhYxOTTRwAe0tk7xnk9dvpo hK9sCby99Wd1iiSYSpv5IfVDfMKvHbzcp1CUV7WIMHB2nlkF0Hq5tQ+7/54Hq4rS2yfXIB zxHXKo2tgj4jleZiWk12vDXzx/qhAG+4SlgDJDLOHzr1U8Zr4po9HNuQyYX5nX9fML8uSN RdXEaFdMtQMIo1cQSm1xIYxYDKta7vKHOqJrMA3XBI9GyWbIYbk/ePkkeU5j3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731529943; 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=VcqFGstfyvtJQAGu1eVFo4tGZHh/2Mw4nsd2+U4fMlc=; b=Xb/jsDOJo3WFpsNN0a8GdNURJje2CyspqWYeHTlgqCVd4mLiaBrI93QN0rTDWvI/ryRdJw yKPv4b1w2UluqezQ24pczucPTyz8W2dP2QrJJ0hKeQwKqUk29OHt++oyMXwaANGfZbnZ+7 ZLafcc/W6kD1D3JOuS9hNASfJSp004aUGEO8akJy73xUh944vsKN9LqWw5h49ZiGdZG0ca cM80EoPXmt87l17vGCHvqtXVOPxzJ9jMT5jrL0/YIlUMKKd3nejVH/kbxwfBBBQpW7dDGd b/Zssk2SDsNJxM/8UhFwcYhcNb5u0R5I56SmUiZD5u0jqSbNnZo3kv6v8ZjE/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731529943; a=rsa-sha256; cv=none; b=rc+1aU+0BEKjyZgUpvJQFWOx0rmEK4YX4hWfPdkgAtvjlVGjenrMXGcuXRhLQqIcd8akqy 2WvBoAdvGwj31T+JJ0l3P01h87DscvMLBgIUktc7BCY5v5AjqojKsE7QXsnwFGCjauGWau S10kMZ1gpfBnsmiuLLfIMLOuwqeqUNAnm/QUdxZ7WGOStp04oflwaC67e5Qxxd2mf226Jn ejgLAOssVT5mMbYpdhlSeVTX+tqOd42aACuEuihm3nslHm1eRbu010yw7foiqnOaGYjJso nMUyyzJTRlqnzUjFUaI6kCbu3o/P0AiVVOI9owYq0qBJ4UKijirsV+bs8690xg== 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 4XpZhl40NMz18P3; Wed, 13 Nov 2024 20:32:23 +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 4ADKWNhL058423; Wed, 13 Nov 2024 20:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ADKWNE1058420; Wed, 13 Nov 2024 20:32:23 GMT (envelope-from git) Date: Wed, 13 Nov 2024 20:32:23 GMT Message-Id: <202411132032.4ADKWNE1058420@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: f8060500164a - main - databases/mongodb[78]0: fix build with NOAVX enabled 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: f8060500164aa5cb1b7b5b9d461f8390a0588ac0 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8060500164aa5cb1b7b5b9d461f8390a0588ac0 commit f8060500164aa5cb1b7b5b9d461f8390a0588ac0 Author: Ronald Klop AuthorDate: 2024-11-07 15:48:44 +0000 Commit: Ronald Klop CommitDate: 2024-11-13 20:32:04 +0000 databases/mongodb[78]0: fix build with NOAVX enabled Thanks to Yuri and Borja who helped creating patches and tested. PR: 282471 --- databases/mongodb70/Makefile | 7 ++++--- ...patch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp | 11 +++++++++++ databases/mongodb80/Makefile | 7 ++++--- ...patch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp | 11 +++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index b8d3a8b2910b..4e7cb6baf977 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,7 +1,7 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r DISTVERSION= 7.0.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} @@ -88,7 +88,7 @@ GROUPS= mongodb OPTIONS_DEFINE= LTO NOAVX SASL OPTIONS_DEFINE_aarch64= ARMV80A -OPTIONS_DEFAULT= SASL +OPTIONS_DEFAULT= NOAVX SASL # MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream. # Can give corruption on high concurrency. @@ -101,7 +101,8 @@ 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 +NOAVX_EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_third__party_mozjs_SConscript \ + ${FILESDIR}/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client diff --git a/databases/mongodb70/files/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp b/databases/mongodb70/files/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp new file mode 100644 index 000000000000..f68cc2552390 --- /dev/null +++ b/databases/mongodb70/files/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp @@ -0,0 +1,11 @@ +--- src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp.orig 2024-11-07 09:56:02 UTC ++++ src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp +@@ -448,7 +448,7 @@ const char* SIMD::memchr8SSE2(const char* ptr, char va + // assertion failure. Accordingly, we just don't allow that to happen. We + // are not particularly concerned about ensuring that newer 32 bit processors + // get access to the AVX2 functions exposed here. +-# if defined(MOZILLA_MAY_SUPPORT_AVX2) && defined(__x86_64__) ++# if 0 && defined(MOZILLA_MAY_SUPPORT_AVX2) && defined(__x86_64__) + + bool SupportsAVX2() { return supports_avx2(); } + diff --git a/databases/mongodb80/Makefile b/databases/mongodb80/Makefile index d0cd767b77b3..8835aad4f65c 100644 --- a/databases/mongodb80/Makefile +++ b/databases/mongodb80/Makefile @@ -1,7 +1,7 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r DISTVERSION= 8.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} @@ -93,7 +93,7 @@ GROUPS= mongodb OPTIONS_DEFINE= LTO NOAVX SASL OPTIONS_DEFINE_aarch64= ARMV80A -OPTIONS_DEFAULT= SASL +OPTIONS_DEFAULT= NOAVX SASL # MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream. # Can give corruption on high concurrency. @@ -106,7 +106,8 @@ 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 +NOAVX_EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_third__party_mozjs_SConscript \ + ${FILESDIR}/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp 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_extract_mozglue_misc_SIMD.cpp b/databases/mongodb80/files/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp new file mode 100644 index 000000000000..f68cc2552390 --- /dev/null +++ b/databases/mongodb80/files/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp @@ -0,0 +1,11 @@ +--- src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp.orig 2024-11-07 09:56:02 UTC ++++ src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp +@@ -448,7 +448,7 @@ const char* SIMD::memchr8SSE2(const char* ptr, char va + // assertion failure. Accordingly, we just don't allow that to happen. We + // are not particularly concerned about ensuring that newer 32 bit processors + // get access to the AVX2 functions exposed here. +-# if defined(MOZILLA_MAY_SUPPORT_AVX2) && defined(__x86_64__) ++# if 0 && defined(MOZILLA_MAY_SUPPORT_AVX2) && defined(__x86_64__) + + bool SupportsAVX2() { return supports_avx2(); } +