gnu: Remove jemalloc@4.5.0.

* gnu/packages/jemalloc.scm (jemalloc-4.5.0): Merge with ...
(jemalloc): ... this variable.
[arguments]: Convert to gexp and remove obsolete "--disable-thp" flag.
[inputs]: Add PERL.
This commit is contained in:
Marius Bakke 2022-06-26 02:23:48 +02:00
parent 7bd24f5bd1
commit 17527c12e0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -3,6 +3,7 @@
;;; Copyright © 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2021 Ryan Sundberg <ryan@arctype.co>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -25,56 +26,16 @@ (define-module (gnu packages jemalloc)
#:use-module (ice-9 match)
#:use-module ((guix licenses) #:select (bsd-2))
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module (guix build-system gnu))
(define-public jemalloc-4.5.0
(package
(name "jemalloc")
(version "4.5.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/jemalloc/jemalloc/releases/download/"
version "/jemalloc-" version ".tar.bz2"))
(sha256
(base32
"10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-thp-test
;; This test does not check if transparent huge pages are supported
;; on the system before running the test.
(lambda _
(substitute* "Makefile.in"
(("\\$\\(srcroot\\)test/unit/pages.c \\\\") "\\"))
#t)))
#:configure-flags
'(,@(match (%current-system)
((or "i686-linux" "x86_64-linux")
'())
("powerpc-linux"
(list "--disable-thp" "CPPFLAGS=-maltivec"))
(_
(list "--disable-thp"))))))
;; 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"))
(home-page "http://jemalloc.net/")
(synopsis "General-purpose scalable concurrent malloc implementation")
(description
"This library providing a malloc(3) implementation that emphasizes
fragmentation avoidance and scalable concurrency support.")
(license bsd-2)))
(define-public jemalloc
(package
(inherit jemalloc-4.5.0)
(name "jemalloc")
(version "5.3.0")
(source (origin
(method url-fetch)
@ -84,11 +45,34 @@ (define-public jemalloc
(sha256
(base32
"1apyxjd1ixy4g8xkr61p0ny8jiz8vyv1j0k4nxqkxpqrf4g2vf1d"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments jemalloc-4.5.0)
;; 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 (list perl))))
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'delete-thp-test
;; This test does not check if transparent huge pages are supported
;; on the system before running the test.
(lambda _
(substitute* "Makefile.in"
(("\\$\\(srcroot\\)test/unit/pages.c \\\\") "\\")))))
#:configure-flags
;; 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
#~'("--disable-initial-exec-tls"
#$@(match (%current-system)
("powerpc-linux"
(list "CPPFLAGS=-maltivec"))
(_
'())))))
(inputs (list perl))
;; 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"))
(home-page "http://jemalloc.net/")
(synopsis "General-purpose scalable concurrent malloc implementation")
(description
"This library providing a malloc(3) implementation that emphasizes
fragmentation avoidance and scalable concurrency support.")
(license bsd-2)))