[erlang-eleveldb] fix build on s390
Dan Horák
sharkcz at fedoraproject.org
Tue Apr 2 10:15:04 UTC 2013
commit ee8d0b156cd29d09019efa8a89f21153ed482b0f
Author: Dan Horák <dan at danny.cz>
Date: Tue Apr 2 12:14:59 2013 +0200
fix build on s390
erlang-eleveldb-s390.patch | 21 +++++++++++++++++++++
erlang-eleveldb.spec | 8 +++++++-
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/erlang-eleveldb-s390.patch b/erlang-eleveldb-s390.patch
new file mode 100644
index 0000000..08e1cbd
--- /dev/null
+++ b/erlang-eleveldb-s390.patch
@@ -0,0 +1,21 @@
+diff -up basho-eleveldb-27af8f1/c_src/detail.hpp.s390 basho-eleveldb-27af8f1/c_src/detail.hpp
+--- basho-eleveldb-27af8f1/c_src/detail.hpp.s390 2013-04-02 10:53:16.000000000 +0200
++++ basho-eleveldb-27af8f1/c_src/detail.hpp 2013-01-30 01:06:04.000000000 +0100
+@@ -90,7 +90,7 @@ inline uint32_t inc_and_fetch(volatile u
+ #endif
+ }
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || (defined(__s390__) && !defined(__s390x__))
+ template <>
+ inline size_t inc_and_fetch(volatile size_t *ptr)
+ {
+@@ -121,7 +121,7 @@ inline uint32_t dec_and_fetch(volatile u
+ #endif
+ }
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || (defined(__s390__) && !defined(__s390x__))
+ template <>
+ inline size_t dec_and_fetch(volatile size_t *ptr)
+ {
diff --git a/erlang-eleveldb.spec b/erlang-eleveldb.spec
index f2bfe79..babaffe 100644
--- a/erlang-eleveldb.spec
+++ b/erlang-eleveldb.spec
@@ -12,7 +12,7 @@
Name: erlang-%{realname}
Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Erlang LevelDB API
Group: Development/Languages
License: ASL 2.0
@@ -23,6 +23,8 @@ Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Patch1: erlang-eleveldb-0001-Build-against-external-libraries.patch
# FIXME remove support for perf counters (Basho-spoecific leveldb patch)
Patch2: erlang-eleveldb-0002-Disable-perf-counts.patch
+# size_t on s390 is unsigned long
+Patch3: erlang-eleveldb-s390.patch
BuildRequires: erlang-rebar
BuildRequires: leveldb-devel
BuildRequires: snappy-devel
@@ -45,6 +47,7 @@ rm -f c_src/build_deps.sh
rm -f c_src/snappy-1.0.4.tar.gz
%patch1 -p1 -b .systemwide
%patch2 -p1 -b .remove_perf_counters
+%patch3 -p1 -b .s390
%if 0%{?fc17}%{?fc18}
# Another one FIXME
rm -rf test/cacheleak.erl
@@ -80,6 +83,9 @@ rebar eunit -v
%changelog
+* Tue Apr 02 2013 Dan Horák <dan[at]danny.cz> - 1.3.0-2
+- fix build on s390
+
* Mon Mar 11 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3.0-1
- Ver. 1.3.0
More information about the scm-commits
mailing list