upgpkg: mongodb44 4.4.15-2

update patches

4 files changed, 58 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb1c61984092..2def1b8237a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = mongodb44
 	pkgdesc = A high-performance, open source, schema-free document-oriented database (last version to support non-avx CPUs)
 	pkgver = 4.4.15
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mongodb.com/
 	arch = x86_64
 	arch = aarch64
 	license = Apache
 	license = custom:SSPL1
-	makedepends = scons
 	makedepends = python-psutil
 	makedepends = python-setuptools
 	makedepends = python-regex
@@ -35,14 +34,16 @@ pkgbase = mongodb44
 	source = mongodb-4.4.1-gcc11.patch
 	source = mongodb-4.4.10-boost-1.79.patch
 	source = mongodb-4.4.10-no-force-lld.patch
+	source = mongodb-4.4.15-adjust-cache-alignment-assumptions.patch
 	sha256sums = fb7ef14e2539df0addc1e350ad2a0fdb7dd078a60d49ab15d9932f193ea1da33
 	sha256sums = 3757d548cfb0e697f59b9104f39a344bb3d15f802608085f838cb2495c065795
 	sha256sums = b7d18726225cd447e353007f896ff7e4cbedb2f641077bce70ab9d292e8f8d39
-	sha256sums = 631513598bf0e00b4f133d3f253ea76ae2958317fc2acc2d420726f1b76f09dd
+	sha256sums = 184b67c3a9fa894bd4eb8a79fd8bb580904b96c361cd30fd55fe4b1f2e46f507
 	sha256sums = 50c7d3968ee37bf25694f0fe8a92bb097c52c26361c78da620caa2ffa8cf4375
 	sha256sums = d3bc20d0cb4b8662b5326b8a3f2215281df5aed57550fa13de465e05e2044c25
 	sha256sums = f7e6d87b68f7703cdbd45e255962ed5a4f6d583aa76d6fcf4fdc7005211fbf06
 	sha256sums = 4202e039944fde80daa1bd3a5f332c522d8db96b4c3cf7c764355c5fc9089137
 	sha256sums = 76e61d1d4f5b4e7c8cd760b1fc0dc86978a8e180d184cdfc7f61fba7d5543a95
+	sha256sums = e748b669bca526a08c06e5d8ec2bd371b938e57f83a2339d62e38a4527810e47
 
 pkgname = mongodb44
diff --git a/PKGBUILD b/PKGBUILD
index 264a403aec01..d891e1f1241c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@ pkgname=mongodb44
 _pkgname=mongodb
 # #.<odd number>.# releases are unstable development/testing
 pkgver=4.4.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-performance, open source, schema-free document-oriented database (last version to support non-avx CPUs)"
 arch=("x86_64" "aarch64")
 url="https://www.mongodb.com/"
 license=("Apache" "custom:SSPL1")
 depends=('libstemmer' 'snappy' 'boost-libs' 'pcre' 'yaml-cpp' 'curl')
-makedepends=('scons' 'python-psutil' 'python-setuptools' 'python-regex' 'python-cheetah3' 'python-yaml' 'python-requests' 'boost')
+makedepends=('python-psutil' 'python-setuptools' 'python-regex' 'python-cheetah3' 'python-yaml' 'python-requests' 'boost')
 optdepends=('mongodb-tools: mongoimport, mongodump, mongotop, etc'
             'mongosh-bin: interactive shell to connect with MongoDB')
 backup=("etc/mongodb.conf")
@@ -24,16 +24,18 @@ source=(https://fastdl.mongodb.org/src/mongodb-src-r$pkgver.tar.gz
         mongodb-4.4.1-boost.patch
         mongodb-4.4.1-gcc11.patch
         mongodb-4.4.10-boost-1.79.patch
-        mongodb-4.4.10-no-force-lld.patch)
+        mongodb-4.4.10-no-force-lld.patch
+        mongodb-4.4.15-adjust-cache-alignment-assumptions.patch)
 sha256sums=('fb7ef14e2539df0addc1e350ad2a0fdb7dd078a60d49ab15d9932f193ea1da33'
             '3757d548cfb0e697f59b9104f39a344bb3d15f802608085f838cb2495c065795'
             'b7d18726225cd447e353007f896ff7e4cbedb2f641077bce70ab9d292e8f8d39'
-            '631513598bf0e00b4f133d3f253ea76ae2958317fc2acc2d420726f1b76f09dd'
+            '184b67c3a9fa894bd4eb8a79fd8bb580904b96c361cd30fd55fe4b1f2e46f507'
             '50c7d3968ee37bf25694f0fe8a92bb097c52c26361c78da620caa2ffa8cf4375'
             'd3bc20d0cb4b8662b5326b8a3f2215281df5aed57550fa13de465e05e2044c25'
             'f7e6d87b68f7703cdbd45e255962ed5a4f6d583aa76d6fcf4fdc7005211fbf06'
             '4202e039944fde80daa1bd3a5f332c522d8db96b4c3cf7c764355c5fc9089137'
-            '76e61d1d4f5b4e7c8cd760b1fc0dc86978a8e180d184cdfc7f61fba7d5543a95')
+            '76e61d1d4f5b4e7c8cd760b1fc0dc86978a8e180d184cdfc7f61fba7d5543a95'
+            'e748b669bca526a08c06e5d8ec2bd371b938e57f83a2339d62e38a4527810e47')
 
 _scons_args=(
   --use-system-pcre # wait for pcre 8.44+ https://jira.mongodb.org/browse/SERVER-40836 and https://jira.mongodb.org/browse/SERVER-42990
@@ -71,8 +73,9 @@ prepare() {
   # See: https://jira.mongodb.org/browse/SERVER-38086
   sed -i 's/\[Service]/[Service]\nTimeoutStartSec=infinity/' rpm/mongod.service
 
-  if [[ "$CARCH" == "aarch64" ]]; then
+  if [[ $CARCH == "aarch64" ]]; then
     _scons_args+=(--use-hardware-crc32=off)
+    patch -Np1 -i ../mongodb-4.4.15-adjust-cache-alignment-assumptions.patch
   fi
 
   if check_option debug y; then
@@ -84,17 +87,19 @@ prepare() {
   fi
 
   # apply gentoo patches
-  for file in $srcdir/*.patch; do
-    echo "Applying patch $file..."
-    patch -Np1 -i $file
-  done
+  patch -Np1 -i ../mongodb-4.4.1-fix-scons.patch
+  patch -Np1 -i ../mongodb-4.4.8-no-compass.patch
+  patch -Np1 -i ../mongodb-4.4.1-boost.patch
+  patch -Np1 -i ../mongodb-4.4.1-gcc11.patch
+  patch -Np1 -i ../mongodb-4.4.10-boost-1.79.patch
+  patch -Np1 -i ../mongodb-4.4.10-no-force-lld.patch
 }
 
 build() {
   cd "${srcdir}/${_pkgname}-src-r${pkgver}"
 
   export SCONSFLAGS="$MAKEFLAGS"
-  scons install-devcore "${_scons_args[@]}"
+  ./buildscripts/scons.py install-devcore "${_scons_args[@]}"
 }
 
 package() {
diff --git a/mongodb-4.4.1-fix-scons.patch b/mongodb-4.4.1-fix-scons.patch
index 8b9d5d6d9fa2..3d93d18e586f 100644
--- a/mongodb-4.4.1-fix-scons.patch
+++ b/mongodb-4.4.1-fix-scons.patch
@@ -27,7 +27,7 @@ index 89c044ab..a6d02072 100644
 -    #make scons colorgcc friendly
 -    for key in ('HOME', 'TERM'):
 +    #make scons colorgcc, distcc, ccache friendly
-+    for key in ('HOME', 'PATH', 'TERM'):
++    for key in ('HOME', 'PATH', 'TERM', 'DISTCC_HOSTS'):
          try:
              env['ENV'][key] = os.environ[key]
          except KeyError:
diff --git a/mongodb-4.4.15-adjust-cache-alignment-assumptions.patch b/mongodb-4.4.15-adjust-cache-alignment-assumptions.patch
new file mode 100644
index 000000000000..27c4a2da4d4a
--- /dev/null
+++ b/mongodb-4.4.15-adjust-cache-alignment-assumptions.patch
@@ -0,0 +1,37 @@
+From 5c9e0d0fc9188bab0ae09c9c33df01938b0c1b6c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 14 Apr 2022 09:25:33 -0700
+Subject: [PATCH] server: Adjust the cache alignment assumptions
+
+aarch64 has 256 for hardware_destructive_interference_size and gcc 12
+has added a warning to complain about mismatches which results in
+static_assert failures
+
+In file included from src/mongo/s/commands/cluster_find_cmd.cpp:39:
+src/mongo/db/stats/counters.h:185:47: error: static assertion failed: cache line spill
+ 185 |     static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size,
+     |                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The structure need to ensure true sharing for both the elements
+so align it to hardware_constructive_interference_size instead
+
+Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/mongo/db/stats/counters.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/mongo/db/stats/counters.h
++++ b/src/mongo/db/stats/counters.h
+@@ -182,8 +182,8 @@ private:
+         AtomicWord<long long> requests{0};
+     };
+     CacheAligned<Together> _together{};
+-    static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size,
+-                  "cache line spill");
++    static_assert(sizeof(Together) <= stdx::hardware_constructive_interference_size,
++                   "cache line spill");
+
+     CacheAligned<AtomicWord<long long>> _logicalBytesOut{0};
+