diff --git a/jemalloc-common.file b/jemalloc-common.file index 3259415f2cb..b374c6bc55c 100644 --- a/jemalloc-common.file +++ b/jemalloc-common.file @@ -1,5 +1,5 @@ -%define jemalloc_version 5.2.1 -%define tag de1caefb587217f0b519eb425d7a9b3570e5ba28 +%define jemalloc_version 5.3.0 +%define tag 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c %define branch cms/%{realversion} %define github_user cms-externals Source: git+https://github.com/%{github_user}/jemalloc.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz diff --git a/jemalloc-debug.spec b/jemalloc-debug.spec index d7de5d79352..3f762465f39 100644 --- a/jemalloc-debug.spec +++ b/jemalloc-debug.spec @@ -2,15 +2,14 @@ ### RPM external jemalloc-debug %{jemalloc_version} %build -# Disable documentation (not needed) -sed -ibak 's/install: install_bin install_include install_lib install_doc/install: install_bin install_include install_lib/' Makefile.in -./autogen.sh - -./configure \ +./autogen.sh \ + --enable-shared \ + --disable-static \ + --disable-doc \ --enable-stats \ - --prefix %{i} \ --enable-debug \ - --enable-fill + --enable-fill \ + --prefix %{i} %post %{relocateConfig}bin/jemalloc.sh diff --git a/jemalloc-prof.spec b/jemalloc-prof.spec index 2e50c1b9600..616b4ae9b1d 100644 --- a/jemalloc-prof.spec +++ b/jemalloc-prof.spec @@ -1,3 +1,5 @@ +# any "Requires" must come before "## INCLUDE jemalloc-common" +# to make sure they are declared before the "%prep" section defined there Requires: libunwind ## INCLUDE jemalloc-common ### RPM external jemalloc-prof %{jemalloc_version} @@ -7,7 +9,8 @@ export CXXFLAGS=-I$LIBUNWIND_ROOT/include export CFLAGS=-I$LIBUNWIND_ROOT/include export LDFLAGS=-L$LIBUNWIND_ROOT/lib -./autogen.sh --enable-shared \ +./autogen.sh \ + --enable-shared \ --disable-static \ --disable-doc \ --enable-stats \ diff --git a/jemalloc.spec b/jemalloc.spec index cfa04b411f1..ec615a41b84 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -2,8 +2,8 @@ ### RPM external jemalloc %{jemalloc_version} %build - -./autogen.sh --enable-shared \ +./autogen.sh \ + --enable-shared \ --disable-static \ --disable-doc \ --enable-stats \