Please excuse my clumsiness, THIS is the fixed patch file. (I accidentally re-sent the original patch.) -- Sincerely, Ryan Sundberg On 6/21/21 10:52 PM, Ryan Sundberg via Guix-patches via wrote: > Sorry, I missed a spot rebasing this last patch. Please use the attached > patch which builds. > > > -- > Sincerely, > Ryan Sundberg > > On 6/21/21 10:44 PM, Ryan Sundberg wrote: >> Disable the thread local storage model in jemalloc 5 to prevent >> shared libraries linked to libjemalloc from crashing on dlopen(). >> https://github.com/jemalloc/jemalloc/issues/937 >> >> This bug affects both Java JNI and python libraries which link to >> jemalloc 5, such as RocksDB, which will crash the program when loaded. >> >> * gnu/packages/jemalloc.scm (jemalloc)[arguments]: Add --disable-initial-exec-tls >> configure flag. >> --- >> gnu/packages/jemalloc.scm | 26 +++++++++++++++++--------- >> 1 file changed, 17 insertions(+), 9 deletions(-) >> >> diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm >> index c4b87b540d..67a1ca8e14 100644 >> --- a/gnu/packages/jemalloc.scm >> +++ b/gnu/packages/jemalloc.scm >> @@ -2,6 +2,7 @@ >> ;;; Copyright © 2015 Sou Bunnbu >> ;;; Copyright © 2017 Efraim Flashner >> ;;; Copyright © 2017 Eric Bavier >> +;;; Copyright © 2021 Ryan Sundberg >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -29,10 +30,10 @@ >> #:use-module (gnu packages perl) >> #:use-module (guix build-system gnu)) >> >> -(define-public jemalloc >> +(define jemalloc-4.5.0 >> (package >> (name "jemalloc") >> - (version "5.2.1") >> + (version "4.5.0") >> (source (origin >> (method url-fetch) >> (uri (string-append >> @@ -40,7 +41,7 @@ >> version "/jemalloc-" version ".tar.bz2")) >> (sha256 >> (base32 >> - "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl")))) >> + "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl")))) >> (build-system gnu-build-system) >> (arguments >> `(#:phases >> @@ -58,7 +59,7 @@ >> ;; Transparent huge pages are only enabled by default on Intel processors >> '() >> '(#:configure-flags (list "--disable-thp"))))) >> - (inputs `(("perl" ,perl))) >> + (inputs '()) >> ;; Install the scripts to a separate output to avoid referencing Perl and >> ;; Bash in the default output, saving ~75 MiB on the closure. >> (outputs '("out" "bin")) >> @@ -69,10 +70,10 @@ >> fragmentation avoidance and scalable concurrency support.") >> (license bsd-2))) >> >> -(define-public jemalloc-4.5.0 >> +(define-public jemalloc >> (package >> - (inherit jemalloc) >> - (version "4.5.0") >> + (inherit jemalloc-4.5.0) >> + (version "5.2.1") >> (source (origin >> (method url-fetch) >> (uri (string-append >> @@ -80,5 +81,12 @@ fragmentation avoidance and scalable concurrency support.") >> version "/jemalloc-" version ".tar.bz2")) >> (sha256 >> (base32 >> - "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl")))) >> - (inputs '()))) >> + "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl")))) >> + (arguments >> + (substitute-keyword-arguments (package-arguments jemalloc-base) >> + ;; Disable the thread local storage model in jemalloc 5 to prevent >> + ;; shared libraries linked to libjemalloc from crashing on dlopen() >> + ;; https://github.com/jemalloc/jemalloc/issues/937 >> + ((#:configure-flags base-configure-flags '()) >> + `(cons "--disable-initial-exec-tls" ,base-configure-flags)))) >> + (inputs `(("perl" ,perl))))) >>