From 06be316111b70fb46aa4ee77f2fbf9e6308a2fb6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Apr 2017 11:03:49 +0300 Subject: [PATCH] gnu: jemalloc: Disable transparent huge pages on non-Intel systems. * gnu/packages/jemalloc.scm (jemalloc)[arguments]: On non-Intel systems add '--disable-thp' to #:configure-flags. Adjust #:phases to remove offending test which incorrectly tests transparent huge pages. --- gnu/packages/jemalloc.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index fcc9cc8082..27fb46e59d 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,6 +18,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages jemalloc) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module ((guix licenses) #:select (bsd-2)) #:use-module (guix packages) #:use-module (guix download) @@ -37,6 +40,22 @@ (define-public jemalloc (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))) + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) + '("x64_64" "i686")) + ;; Transparent huge pages are only enabled by default on Intel processors + '() + '(#:configure-flags (list "--disable-thp"))))) (home-page "http://jemalloc.net/") (synopsis "General-purpose scalable concurrent malloc implementation") (description