From 0fdf2cdef0c0ab8a43a539e2917d82c8ee4c4e73 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Jun 2021 16:11:10 +0300 Subject: gnu: jemalloc: Fix building on powerpc-linux. * gnu/packages/jemalloc.scm (jemalloc)[arguments]: Change configure-flags so they are configurable per-architecture. --- gnu/packages/jemalloc.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index 906330a4b6..96713dbe52 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2017, 2020 Efraim Flashner +;;; Copyright © 2017, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. @@ -21,6 +21,7 @@ (define-module (gnu packages jemalloc) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (ice-9 match) #:use-module ((guix licenses) #:select (bsd-2)) #:use-module (guix packages) #:use-module (guix download) @@ -52,12 +53,14 @@ (substitute* "Makefile.in" (("\\$\\(srcroot\\)test/unit/pages.c \\\\") "\\")) #t))) - ,@(if (any (cute string-prefix? <> (or (%current-target-system) - (%current-system))) - '("x86_64" "i686")) - ;; Transparent huge pages are only enabled by default on Intel processors - '() - '(#:configure-flags (list "--disable-thp"))))) + #:configure-flags + '(,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + '()) + ("powerpc-linux" + (list "--disable-thp" "CPPFLAGS=-maltivec")) + (_ + (list "--disable-thp")))))) (inputs `(("perl" ,perl))) ;; Install the scripts to a separate output to avoid referencing Perl and ;; Bash in the default output, saving ~75 MiB on the closure. -- cgit v1.2.3