talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

jemalloc: fix reproducibility issues

Browse Source 
Working towards making the build deterministic regardless of the build host

Page size:

https://github.com/jemalloc/jemalloc/issues/467
https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/
https://github.com/NixOS/nixpkgs/issues/380852

Darwin:

Similar to https://github.com/NixOS/nixpkgs/pull/394620

LG_VADDR:

https://github.com/jemalloc/jemalloc/issues/1997
This commit is contained in:
Arnout Engelen 2025-03-27 14:17:41 +01:00
parent 698214a32b
commit d895f1b957
No known key found for this signature in database
GPG Key ID: 061107B0F74A6DAA
2 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/development/libraries/jemalloc/default.nix
View File

@ -1,8 +1,11 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
fetchpatch,
autogen,
autoconf,
automake,
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc.
@ -16,9 +19,11 @@ stdenv.mkDerivation rec {
pname = "jemalloc";
version = "5.3.0";
src = fetchurl {
url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo=";
src = fetchFromGitHub {
owner = "jemalloc";
repo = "jemalloc";
tag = version;
hash = "sha256-bb0OhZVXyvN+hf9BpPSykn5cGm87a0C+Y/iXKt9wTSs=";
};
patches = [
@ -33,11 +38,32 @@ stdenv.mkDerivation rec {
url = "https://github.com/jemalloc/jemalloc/commit/4422f88d17404944a312825a1aec96cd9dc6c165.patch";
hash = "sha256-dunkE7XHzltn5bOb/rSHqzpRniAFuGubBStJeCxh0xo=";
})
# -O3 appears to introduce an unreproducibility where
# `rtree_read.constprop.0` shows up in some builds but
# not others, so we fall back to O2:
./o3-to-o2.patch
];
nativeBuildInputs = [
autogen
autoconf
automake
];
preConfigure =
''
./autogen.sh
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
export LDFLAGS="$LDFLAGS -Wl,-no_uuid -Wl,-install_name,@rpath/libjemalloc.2.dylib";
'';
configureFlags =
[
"--with-lg-vaddr=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}"
]
# see the comment on stripPrefix
lib.optional stripPrefix "--with-jemalloc-prefix="
++ lib.optional stripPrefix "--with-jemalloc-prefix="
++ lib.optional disableInitExecTls "--disable-initial-exec-tls"
# jemalloc is unable to correctly detect transparent hugepage support on
# ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
@ -46,9 +72,10 @@ stdenv.mkDerivation rec {
"--disable-thp"
"je_cv_thp=no"
]
# AArch64 has configurable page size up to 64k. The default configuration
# for jemalloc only supports 4k page sizes.
++ lib.optional stdenv.hostPlatform.isAarch64 "--with-lg-page=16"
# The upstream default is dependent on the builders' page size
# https://github.com/jemalloc/jemalloc/issues/467
# https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/
++ [ (if stdenv.hostPlatform.isAarch64 then "--with-lg-page=16" else "--with-lg-page=12") ]
# See https://github.com/jemalloc/jemalloc/issues/1997
# Using a value of 48 should work on both emulated and native x86_64-darwin.
++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "--with-lg-vaddr=48";

15
pkgs/development/libraries/jemalloc/o3-to-o2.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/configure.ac b/configure.ac
index 1c9c5067..a0856b89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1372,8 +1372,8 @@ AC_SUBST([enable_debug])
dnl Only optimize if not debugging.
if test "x$enable_debug" = "x0" ; then
if test "x$GCC" = "xyes" ; then
- JE_CFLAGS_ADD([-O3])
- JE_CXXFLAGS_ADD([-O3])
+ JE_CFLAGS_ADD([-O2])
+ JE_CXXFLAGS_ADD([-O2])
JE_CFLAGS_ADD([-funroll-loops])
elif test "x$je_cv_msvc" = "xyes" ; then
JE_CFLAGS_ADD([-O2])