Request 1404 (accepted)

Overview

Request 1404 (accepted)

Submit erlang-eleveldb to Winterfell

Created by vanmeeuwen over 8 years ago
In state accepted

Submit erlang-eleveldb

Submit package Kolab:Development / erlang-eleveldb to package Kolab:Winterfell / erlang-eleveldb

erlang-eleveldb.spec Added

@@ -0,0 +1,141 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore:  ghostscript-x11
+%endif
+
+%global realname eleveldb
+%global upstream basho
+%global git_tag b51dce2
+%global patchnumber 0
+%{?filter_setup:
+%filter_provides_in %{_libdir}/erlang/lib/.*\.so$
+%filter_setup
+}
+%{expand: %(NIF_VER=`rpm -q erlang-erts --provides | grep --color=no erl_nif_version` ; if [ "$NIF_VER" != "" ]; then echo %%global __erlang_nif_version $NIF_VER ; fi)}
+%{expand: %(DRV_VER=`rpm -q erlang-erts --provides | grep --color=no erl_drv_version` ; if [ "$DRV_VER" != "" ]; then echo %%global __erlang_drv_version $DRV_VER ; fi)}
+
+
+Name:		erlang-%{realname}
+Version:	2.1.2
+Release:	1%{?dist}
+Summary:	Erlang LevelDB API
+Group:		Development/Languages
+License:	ASL 2.0
+URL:		https://github.com/basho/eleveldb
+%if 0%{?el7}%{?fedora}
+VCS:		scm:git:https://github.com/basho/eleveldb.git
+%endif
+# wget --content-disposition https://github.com/basho/eleveldb/tarball/2.1.2
+Source0:	%{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+
+Patch1:     erlang-eleveldb-2.1.2-system-libraries.patch
+Patch2:     erlang-eleveldb-2.1.2-set-version.patch
+
+BuildRequires:  erlang-cuttlefish >= 2.0.1
+BuildRequires:	erlang-rebar
+BuildRequires:	erlang-rpm-macros >= 0.1.4
+BuildRequires:  gcc-c++
+BuildRequires:	leveldb-devel >= 2.0.7
+BuildRequires:	snappy-devel
+# Error:erlang(erlang:load_nif/2) in R12B and older
+# Error:erlang(erlang:nif_error/1) in R13B and older
+# Error:erlang(lists:keyfind/3) in R12B and older
+Requires:	erlang-erts%{?_isa} >= R14B
+Requires:	erlang-kernel%{?_isa}
+Requires:	erlang-stdlib%{?_isa}
+%{?__erlang_nif_version:Requires: %{__erlang_nif_version}}
+
+
+%description
+Erlang LevelDB API.
+
+
+%prep
+%setup -q -n %{upstream}-%{realname}-5bdcab1
+rm -f c_src/build_deps.sh
+rm -f c_src/snappy-1.0.4.tar.gz
+%patch1 -p1
+%patch2 -p1
+
+%if 0%{?fc17}%{?fc18}%{?fc20}%{?fc21}%{?fc22}
+# Another one FIXME
+rm -rf test/cacheleak.erl
+%endif
+
+
+%build
+rebar compile -vv
+
+
+%install
+mkdir -p %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/{ebin,priv}
+install -p -m 0644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+install -p -m 0644 ebin/%{realname}.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+install -p -m 0644 ebin/%{realname}_bump.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+install -p -m 0755 priv/%{realname}.so %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv/
+install -p -m 0644 priv/*.schema %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/priv/
+
+
+%check
+rebar eunit -v || :
+
+
+%files
+%doc README.md
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/
+%dir %{_libdir}/erlang/lib/%{realname}-%{version}/priv/
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_bump.beam
+%{_libdir}/erlang/lib/%{realname}-%{version}/priv/%{realname}.so
+%{_libdir}/erlang/lib/%{realname}-%{version}/priv/*.schema
+
+
+
+%changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Nov 04 2014 Peter Lemenkov <lemenkov@gmail.com> - 1.3.2-7
+- Rebuild with Erlang 17.3.3
+
+* Thu Aug 28 2014 Peter Lemenkov <lemenkov@gmail.com> - 1.3.2-6
+- Rebuild with Erlang 17.2.1
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jul 12 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-4
+- Use new erlang macros to build with $RPM_OPT/LD_FLAGS etc, verbosely
+- Disable cache leak test on F-20, F-21, and F-22 (#1107767, #1106223)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 03 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.3.2-1
+- Ver. 1.3.2
+
+* 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@gmail.com> - 1.3.0-1
+- Ver. 1.3.0
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Oct 11 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.2.2-1
+- Ver. 1.2.2
+
+* Wed Jul 18 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.1.0-2
+- Remove EL5-specific stuff from spec-file
+- Enable tests
+
+* Thu May 17 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.1.0-1
+- Ver. 1.1.0
+
+* Fri Sep 16 2011 Peter Lemenkov <lemenkov@gmail.com> - 1.0.0-1
+- Ver. 1.0.0

erlang-eleveldb-0002-Disable-perf-counts.patch Added

@@ -0,0 +1,107 @@
+From 62959e75f7556536cbfa78d6a094263ab9d93d1e Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sun, 10 Mar 2013 18:02:51 +0400
+Subject: [PATCH 2/4] Disable perf counts
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ c_src/eleveldb.cc   | 6 ------
+ c_src/refobjects.cc | 2 --
+ c_src/refobjects.h  | 1 -
+ c_src/workitems.cc  | 1 -
+ 4 files changed, 10 deletions(-)
+
+diff --git a/c_src/eleveldb.cc b/c_src/eleveldb.cc
+index 6f718d0..76f0201 100644
+--- a/c_src/eleveldb.cc
++++ b/c_src/eleveldb.cc
+@@ -37,7 +37,6 @@
+ #include "leveldb/write_batch.h"
+ #include "leveldb/cache.h"
+ #include "leveldb/filter_policy.h"
+-#include "leveldb/perf_count.h"
+ 
+ #ifndef INCL_THREADING_H
+     #include "threading.h"
+@@ -305,12 +304,10 @@ FindWaitingThread(
+              // to address race condition, thread might be waiting now
+              FindWaitingThread(NULL);
+ 
+-             perf()->Inc(leveldb::ePerfElevelQueued);
+              ret_flag=true;
+          }   // if
+          else
+          {
+-             perf()->Inc(leveldb::ePerfElevelDirect);
+              ret_flag=true;
+          }   // else
+      }   // if
+@@ -342,7 +339,6 @@ FindWaitingThread(
+ 
+  size_t work_queue_size() const { return work_queue.size(); }
+  bool shutdown_pending() const  { return shutdown; }
+- leveldb::PerformanceCounters * perf() const {return(leveldb::gPerfCounters);};
+ 
+ 
+  private:
+@@ -544,7 +540,6 @@ void *eleveldb_write_thread_worker(void *args)
+                     submission=h.work_queue.front();
+                     h.work_queue.pop_front();
+                     eleveldb::dec_and_fetch(&h.work_queue_atomic);
+-                    h.perf()->Inc(leveldb::ePerfElevelDequeued);
+                 }   // if
+ 
+                 h.unlock();
+@@ -670,7 +665,6 @@ ERL_NIF_TERM parse_open_option(ErlNifEnv* env, ERL_NIF_TERM item, leveldb::Optio
+             unsigned long bfsize = 16;
+             if (option[1] == eleveldb::ATOM_TRUE || enif_get_ulong(env, option[1], &bfsize))
+             {
+-                opts.filter_policy = leveldb::NewBloomFilterPolicy2(bfsize);
+             }
+         }
+     }
+diff --git a/c_src/refobjects.cc b/c_src/refobjects.cc
+index 3371ce2..288963b 100644
+--- a/c_src/refobjects.cc
++++ b/c_src/refobjects.cc
+@@ -44,13 +44,11 @@ namespace eleveldb {
+ RefObject::RefObject()
+     : m_RefCount(0)
+ {
+-        leveldb::gPerfCounters->Inc(leveldb::ePerfElevelRefCreate);
+ }   // RefObject::RefObject
+ 
+ 
+ RefObject::~RefObject()
+ {
+-    leveldb::gPerfCounters->Inc(leveldb::ePerfElevelRefDelete);
+ }   // RefObject::~RefObject
+ 
+ 
+diff --git a/c_src/refobjects.h b/c_src/refobjects.h
+index 2309afd..b454bda 100644
+--- a/c_src/refobjects.h
++++ b/c_src/refobjects.h
+@@ -28,7 +28,6 @@
+ 
+ #include "leveldb/db.h"
+ #include "leveldb/write_batch.h"
+-#include "leveldb/perf_count.h"
+ 
+ #ifndef INCL_THREADING_H
+     #include "threading.h"
+diff --git a/c_src/workitems.cc b/c_src/workitems.cc
+index 79cf7ff..89f41eb 100644
+--- a/c_src/workitems.cc
++++ b/c_src/workitems.cc
+@@ -29,7 +29,6 @@
+ 
+ #include "leveldb/cache.h"
+ #include "leveldb/filter_policy.h"
+-#include "leveldb/perf_count.h"
+ 
+ // error_tuple duplicated in workitems.cc and eleveldb.cc ... how to fix?
+ static ERL_NIF_TERM error_tuple(ErlNifEnv* env, ERL_NIF_TERM error, leveldb::Status& status)
+-- 
+1.8.3.1
+

erlang-eleveldb-0003-fix-build-on-s390.patch Added

erlang-eleveldb-0004-TEMPORARILY-skip-verify_compactions-option.patch Added

@@ -0,0 +1,28 @@
+From f1259cd3a696f753124c5889e755f4d02a88f5aa Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 6 Jul 2013 09:35:28 +0400
+Subject: [PATCH 4/4] TEMPORARILY skip verify_compactions option
+
+This isn't supported yet in system-wide leveldb, only in Basho's fork.
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ c_src/eleveldb.cc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/c_src/eleveldb.cc b/c_src/eleveldb.cc
+index 76f0201..adb3a63 100644
+--- a/c_src/eleveldb.cc
++++ b/c_src/eleveldb.cc
+@@ -605,8 +605,6 @@ ERL_NIF_TERM parse_open_option(ErlNifEnv* env, ERL_NIF_TERM item, leveldb::Optio
+             opts.error_if_exists = (option[1] == eleveldb::ATOM_TRUE);
+         else if (option[0] == eleveldb::ATOM_PARANOID_CHECKS)
+             opts.paranoid_checks = (option[1] == eleveldb::ATOM_TRUE);
+-        else if (option[0] == eleveldb::ATOM_VERIFY_COMPACTIONS)
+-            opts.verify_compactions = (option[1] == eleveldb::ATOM_TRUE);
+         else if (option[0] == eleveldb::ATOM_MAX_OPEN_FILES)
+         {
+             int max_open_files;
+-- 
+1.8.3.1
+

erlang-eleveldb-2.1.2-set-version.patch Added

erlang-eleveldb-2.1.2-system-libraries.patch Added

@@ -0,0 +1,24 @@
+diff -ur basho-eleveldb-5bdcab1.orig/rebar.config basho-eleveldb-5bdcab1/rebar.config
+--- basho-eleveldb-5bdcab1.orig/rebar.config	2015-06-15 22:51:01.000000000 +0200
++++ basho-eleveldb-5bdcab1/rebar.config	2015-07-08 13:55:25.635283767 +0200
+@@ -13,14 +13,9 @@
+        ]}.
+ 
+ {port_env, [
+-         %% Make sure to set -fPIC when compiling leveldb
+-             {"CFLAGS", "$CFLAGS -Wall -O3 -fPIC"},
+-             {"CXXFLAGS", "$CXXFLAGS -Wall -O3 -fPIC"},
+-             {"DRV_CFLAGS", "$DRV_CFLAGS -O3 -Wall -I c_src/leveldb/include"},
+-             {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"}
+-             ]}.
+-
+-{pre_hooks, [{'get-deps', "c_src/build_deps.sh get-deps"},
+-             {compile, "c_src/build_deps.sh"}]}.
+-
+-{post_hooks, [{clean, "c_src/build_deps.sh clean"}]}.
++        %% Make sure to set -fPIC when compiling leveldb
++        {"CFLAGS", "$CFLAGS -Wall -O3 -fPIC"},
++        {"CXXFLAGS", "$CXXFLAGS -Wall -O3 -fPIC"},
++        {"DRV_CFLAGS", "$DRV_CFLAGS -O3 -Wall"},
++        {"DRV_LDFLAGS", "$DRV_LDFLAGS -lleveldb -lsnappy -lstdc++"}
++    ]}.