Merge pull request #7396 from cms-sw/jemalloc-common-src

Use same soruces for jemalloc and jemalloc-debug
cms-sw · Oct 19, 2021 · 3f83e21 · 3f83e21
2 parents b47987f + 17e8689
commit 3f83e21
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/jemalloc-common.file b/jemalloc-common.file
@@ -0,0 +1,9 @@
+%define jemalloc_version 5.2.1
+%define tag de1caefb587217f0b519eb425d7a9b3570e5ba28
+%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
+BuildRequires: autotools
+
+%prep
+%setup -n %{n}-%{realversion}
diff --git a/jemalloc-debug.spec b/jemalloc-debug.spec
@@ -1,14 +1,5 @@
-### RPM external jemalloc-debug 4.5.0
-
-%define tag %{realversion}
-%define branch master
-%define github_user jemalloc
-Source: git+https://github.com/%{github_user}/jemalloc.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
-
-BuildRequires: autotools
-
-%prep
-%setup -n %{n}-%{realversion}
+## INCLUDE jemalloc-common
+### RPM external jemalloc-debug %{jemalloc_version}
 
 %build
 # Disable documentation (not needed)

diff --git a/jemalloc.spec b/jemalloc.spec
@@ -1,14 +1,5 @@
-### RPM external jemalloc 5.2.1
-
-%define tag de1caefb587217f0b519eb425d7a9b3570e5ba28
-%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
-
-BuildRequires: autotools
-
-%prep
-%setup -n %{n}-%{realversion}
+## INCLUDE jemalloc-common
+### RPM external jemalloc %{jemalloc_version}
 
 %build