From b98caa21aac8aa1ff4d0873d67e27e60a7859525 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Thu, 8 Mar 2018 13:01:28 +0100 Subject: [PATCH] Actually, specify pagesizes according to arches, closes #1545539 Remove patch disabling thp as this is now handled by configure, see upstream issue 526 --- jemalloc.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/jemalloc.spec b/jemalloc.spec index 619d7f4..a917461 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -1,7 +1,7 @@ Name: jemalloc Version: 5.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: General-purpose scalable concurrent malloc implementation Group: System Environment/Libraries @@ -12,9 +12,6 @@ Source0: https://github.com/jemalloc/%{name}/releases/download/%{version} # Disable explicit altivec Patch4: jemalloc-5.0.1.no_explicit_altivec.patch -# No Transparent Hugepages on systems not supporting them -Patch5: jemalloc-4.4.0.disable_thp.patch - # Upstream issue #979 Patch6: jemalloc_fix_test_suite_segv_aarch64.patch @@ -41,17 +38,21 @@ developing applications that use %{name}. %setup -q %patch4 +%patch6 -p1 # Override PAGESIZE, bz #1545539 -%define lg_page --with-lg-page=16 +%ifarch %ix86 %arm x86_64 s390x +%define lg_page --with-lg-page=12 +%endif -# Disable thp on systems not supporting this, trusting that Fedora will enable -# this on the build servers when ready for installed systems. +%ifarch ppc64 ppc64le aarch64 +%define lg_page --with-lg-page=16 +%endif + +# Disable thp on systems not supporting this for now %ifarch %ix86 %arm aarch64 s390x %define disable_thp --disable-thp -%patch5 %endif -%patch6 -p1 %build @@ -115,6 +116,11 @@ find %{buildroot}%{_libdir}/ -name '*.a' -exec rm -vf {} ';' %ldconfig_scriptlets %changelog +* Thu Mar 08 2018 Ingvar Hagelund - 5.0.1-5 +- Actually, specify pagesizes according to arches, closes #1545539 +- Remove patch disabling thp as this is now handled by configure, see + upstream issue 526 + * Tue Mar 06 2018 Ingvar Hagelund - 5.0.1-4 - Support different pagesizes, ie. build with --with-lg-page=16, closes #1545539