Loading pkgs/servers/nosql/mongodb/7.0.nix +6 −1 Original line number Diff line number Diff line Loading @@ -8,6 +8,7 @@ cctools, avxSupport ? stdenv.hostPlatform.avxSupport, nixosTests, lib, }: let Loading @@ -34,7 +35,11 @@ buildMongoDB { # Fix building with python 3.12 since the imp module was removed ./mongodb-python312.patch ]; # mongodb-7_0's mozjs uses avx2 instructions # https://github.com/GermanAizek/mongodb-without-avx/issues/16 ] ++ lib.optionals (!avxSupport) [ ./mozjs-noavx.patch ]; passthru.tests = { inherit (nixosTests) mongodb; }; Loading pkgs/servers/nosql/mongodb/mozjs-noavx.patch 0 → 100644 +25 −0 Original line number Diff line number Diff line --- a/src/third_party/mozjs/SConscript +++ b/src/third_party/mozjs/SConscript @@ -145,8 +145,7 @@ sources = [ ] if 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"]) + sources.extend(["extract/mozglue/misc/SSE.cpp"]) if env.TargetOSIs('windows'): sources.extend([ diff --git a/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp b/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp index 3893de57b32..4ea0a657fbb 100644 --- a/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp +++ b/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp @@ -448,7 +448,7 @@ const char* SIMD::memchr8SSE2(const char* ptr, char value, size_t length) { // 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 bool SupportsAVX2() { return supports_avx2(); } Loading
pkgs/servers/nosql/mongodb/7.0.nix +6 −1 Original line number Diff line number Diff line Loading @@ -8,6 +8,7 @@ cctools, avxSupport ? stdenv.hostPlatform.avxSupport, nixosTests, lib, }: let Loading @@ -34,7 +35,11 @@ buildMongoDB { # Fix building with python 3.12 since the imp module was removed ./mongodb-python312.patch ]; # mongodb-7_0's mozjs uses avx2 instructions # https://github.com/GermanAizek/mongodb-without-avx/issues/16 ] ++ lib.optionals (!avxSupport) [ ./mozjs-noavx.patch ]; passthru.tests = { inherit (nixosTests) mongodb; }; Loading
pkgs/servers/nosql/mongodb/mozjs-noavx.patch 0 → 100644 +25 −0 Original line number Diff line number Diff line --- a/src/third_party/mozjs/SConscript +++ b/src/third_party/mozjs/SConscript @@ -145,8 +145,7 @@ sources = [ ] if 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"]) + sources.extend(["extract/mozglue/misc/SSE.cpp"]) if env.TargetOSIs('windows'): sources.extend([ diff --git a/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp b/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp index 3893de57b32..4ea0a657fbb 100644 --- a/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp +++ b/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp @@ -448,7 +448,7 @@ const char* SIMD::memchr8SSE2(const char* ptr, char value, size_t length) { // 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 bool SupportsAVX2() { return supports_avx2(); }