[jemalloc] - fix build on s390
Dan Horák
sharkcz at fedoraproject.org
Sat Dec 11 14:09:14 UTC 2010
commit 8b852738a1e86c9787b7137d6a5775fd04600454
Author: Dan Horák <dan at danny.cz>
Date: Sat Dec 11 15:09:03 2010 +0100
- fix build on s390
jemalloc-2.0.1-s390.patch | 12 ++++++++++++
jemalloc.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/jemalloc-2.0.1-s390.patch b/jemalloc-2.0.1-s390.patch
new file mode 100644
index 0000000..b9677e1
--- /dev/null
+++ b/jemalloc-2.0.1-s390.patch
@@ -0,0 +1,12 @@
+diff -up jemalloc-2.0.1/include/jemalloc/internal/jemalloc_internal.h.in.orig jemalloc-2.0.1/include/jemalloc/internal/jemalloc_internal.h.in
+--- jemalloc-2.0.1/include/jemalloc/internal/jemalloc_internal.h.in.orig 2010-12-11 14:23:59.000000000 +0100
++++ jemalloc-2.0.1/include/jemalloc/internal/jemalloc_internal.h.in 2010-12-11 14:24:04.000000000 +0100
+@@ -135,7 +135,7 @@ extern void (*JEMALLOC_P(malloc_message)
+ #ifdef __powerpc__
+ # define LG_QUANTUM 4
+ #endif
+-#ifdef __s390x__
++#ifdef __s390__
+ # define LG_QUANTUM 4
+ #endif
+
diff --git a/jemalloc.spec b/jemalloc.spec
index 7b3ff2c..5efe865 100644
--- a/jemalloc.spec
+++ b/jemalloc.spec
@@ -1,7 +1,7 @@
Name: jemalloc
Version: 2.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: General-purpose scalable concurrent malloc implementation
Group: System Environment/Libraries
@@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Remove pprof, as it already exists in google-perftools
Patch0: jemalloc-2.0.1.no_pprof.patch
+# check for __s390__ as it's defined on both s390 and s390x
+Patch1: jemalloc-2.0.1-s390.patch
%description
General-purpose scalable concurrent malloc(3) implementation.
@@ -29,6 +31,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0
+%patch1 -p1 -b .s390
%build
%configure
@@ -63,6 +66,9 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%changelog
+* Sat Dec 11 2010 Dan Horák <dan[at]danny.cz> - 2.0.1-3
+- fix build on s390
+
* Thu Nov 18 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.0.1-2
- Added a patch that removes pprof, as it already exists in the
google-perftools package
More information about the scm-commits
mailing list