diff --git a/.gitignore b/.gitignore index 616fa28..2f30a65 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /leveldb-1.5.0.tar.gz +/leveldb-1.7.0.tar.gz diff --git a/leveldb-0001-Initial-commit-of-the-autotools-stuff.patch b/leveldb-0001-Initial-commit-of-the-autotools-stuff.patch index 86013ae..62a68b0 100644 --- a/leveldb-0001-Initial-commit-of-the-autotools-stuff.patch +++ b/leveldb-0001-Initial-commit-of-the-autotools-stuff.patch @@ -1,21 +1,19 @@ -From 0bfe5692de28ae1c7dde5f80d3c8591d5ed57df2 Mon Sep 17 00:00:00 2001 +From 2684d33e8c418ac2c8fb2ff01076c56475f4c3d1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 19 May 2012 09:27:13 +0400 -Subject: [PATCH 1/2] Initial commit of the autotools stuff +Subject: [PATCH 1/3] Initial commit of the autotools stuff Signed-off-by: Peter Lemenkov --- - Makefile | 200 -------------------------------------------- - Makefile.am | 134 +++++++++++++++++++++++++++++ - configure.ac | 93 ++++++++++++++++++++ - db/Makefile.am | 33 ++++++++ - helpers/memenv/Makefile.am | 6 ++ - leveldb.pc.in | 9 ++ - port/Makefile.am | 8 ++ - table/Makefile.am | 20 +++++ - util/Makefile.am | 31 +++++++ - 9 files changed, 334 insertions(+), 200 deletions(-) - delete mode 100644 Makefile + Makefile.am | 134 +++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 93 +++++++++++++++++++++++++++++++ + db/Makefile.am | 33 +++++++++++ + helpers/memenv/Makefile.am | 6 ++ + leveldb.pc.in | 9 +++ + port/Makefile.am | 10 ++++ + table/Makefile.am | 20 +++++++ + util/Makefile.am | 33 +++++++++++ + 8 files changed, 338 insertions(+) create mode 100644 Makefile.am create mode 100644 configure.ac create mode 100644 db/Makefile.am @@ -25,212 +23,6 @@ Signed-off-by: Peter Lemenkov create mode 100644 table/Makefile.am create mode 100644 util/Makefile.am -diff --git a/Makefile b/Makefile -deleted file mode 100644 -index c648a28..0000000 ---- a/Makefile -+++ /dev/null -@@ -1,200 +0,0 @@ --# Copyright (c) 2011 The LevelDB Authors. All rights reserved. --# Use of this source code is governed by a BSD-style license that can be --# found in the LICENSE file. See the AUTHORS file for names of contributors. -- --# Inherit some settings from environment variables, if available --INSTALL_PATH ?= $(CURDIR) -- --#----------------------------------------------- --# Uncomment exactly one of the lines labelled (A), (B), and (C) below --# to switch between compilation modes. -- --OPT ?= -O2 -DNDEBUG # (A) Production use (optimized mode) --# OPT ?= -g2 # (B) Debug mode, w/ full line-level debugging symbols --# OPT ?= -O2 -g2 -DNDEBUG # (C) Profiling mode: opt, but w/debugging symbols --#----------------------------------------------- -- --# detect what platform we're building on --$(shell ./build_detect_platform build_config.mk) --# this file is generated by the previous line to set build flags and sources --include build_config.mk -- --CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) --CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -- --LDFLAGS += $(PLATFORM_LDFLAGS) -- --LIBOBJECTS = $(SOURCES:.cc=.o) --MEMENVOBJECTS = $(MEMENV_SOURCES:.cc=.o) -- --TESTUTIL = ./util/testutil.o --TESTHARNESS = ./util/testharness.o $(TESTUTIL) -- --TESTS = \ -- arena_test \ -- bloom_test \ -- c_test \ -- cache_test \ -- coding_test \ -- corruption_test \ -- crc32c_test \ -- db_test \ -- dbformat_test \ -- env_test \ -- filename_test \ -- filter_block_test \ -- log_test \ -- memenv_test \ -- skiplist_test \ -- table_test \ -- version_edit_test \ -- version_set_test \ -- write_batch_test -- --PROGRAMS = db_bench $(TESTS) --BENCHMARKS = db_bench_sqlite3 db_bench_tree_db -- --LIBRARY = libleveldb.a --MEMENVLIBRARY = libmemenv.a -- --default: all -- --# Should we build shared libraries? --ifneq ($(PLATFORM_SHARED_EXT),) -- --ifneq ($(PLATFORM_SHARED_VERSIONED),true) --SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT) --SHARED2 = $(SHARED1) --SHARED3 = $(SHARED1) --SHARED = $(SHARED1) --else --# Update db.h if you change these. --SHARED_MAJOR = 1 --SHARED_MINOR = 5 --SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT) --SHARED2 = $(SHARED1).$(SHARED_MAJOR) --SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR) --SHARED = $(SHARED1) $(SHARED2) $(SHARED3) --$(SHARED1): $(SHARED3) -- ln -fs $(SHARED3) $(SHARED1) --$(SHARED2): $(SHARED3) -- ln -fs $(SHARED3) $(SHARED2) --endif -- --$(SHARED3): -- $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) -- --endif # PLATFORM_SHARED_EXT -- --all: $(SHARED) $(LIBRARY) -- --check: all $(PROGRAMS) $(TESTS) -- for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done -- --clean: -- -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk -- -rm -rf ios-x86/* ios-arm/* -- --$(LIBRARY): $(LIBOBJECTS) -- rm -f $@ -- $(AR) -rs $@ $(LIBOBJECTS) -- --db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -- $(CXX) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS) -- --db_bench_sqlite3: doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL) -- $(CXX) doc/bench/db_bench_sqlite3.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS) -lsqlite3 -- --db_bench_tree_db: doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL) -- $(CXX) doc/bench/db_bench_tree_db.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LDFLAGS) -lkyotocabinet -- --arena_test: util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) util/arena_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --bloom_test: util/bloom_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) util/bloom_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --c_test: db/c_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/c_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --cache_test: util/cache_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) util/cache_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --coding_test: util/coding_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) util/coding_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --corruption_test: db/corruption_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/corruption_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --crc32c_test: util/crc32c_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) util/crc32c_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --db_test: db/db_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/db_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --dbformat_test: db/dbformat_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/dbformat_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --env_test: util/env_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) util/env_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --filename_test: db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/filename_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --filter_block_test: table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) table/filter_block_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --log_test: db/log_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/log_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --table_test: table/table_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) table/table_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --skiplist_test: db/skiplist_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/skiplist_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --version_edit_test: db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --write_batch_test: db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS) -- $(CXX) db/write_batch_test.o $(LIBOBJECTS) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --$(MEMENVLIBRARY) : $(MEMENVOBJECTS) -- rm -f $@ -- $(AR) -rs $@ $(MEMENVOBJECTS) -- --memenv_test : helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) -- $(CXX) helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHARNESS) -o $@ $(LDFLAGS) -- --ifeq ($(PLATFORM), IOS) --# For iOS, create universal object files to be used on both the simulator and --# a device. --PLATFORMSROOT=/Applications/Xcode.app/Contents/Developer/Platforms --SIMULATORROOT=$(PLATFORMSROOT)/iPhoneSimulator.platform/Developer --DEVICEROOT=$(PLATFORMSROOT)/iPhoneOS.platform/Developer --IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBundleShortVersionString) -- --.cc.o: -- mkdir -p ios-x86/$(dir $@) -- $(SIMULATORROOT)/usr/bin/$(CXX) $(CXXFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -c $< -o ios-x86/$@ -- mkdir -p ios-arm/$(dir $@) -- $(DEVICEROOT)/usr/bin/$(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ -- lipo ios-x86/$@ ios-arm/$@ -create -output $@ -- --.c.o: -- mkdir -p ios-x86/$(dir $@) -- $(SIMULATORROOT)/usr/bin/$(CC) $(CFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -c $< -o ios-x86/$@ -- mkdir -p ios-arm/$(dir $@) -- $(DEVICEROOT)/usr/bin/$(CC) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ -- lipo ios-x86/$@ ios-arm/$@ -create -output $@ -- --else --.cc.o: -- $(CXX) $(CXXFLAGS) -c $< -o $@ -- --.c.o: -- $(CC) $(CFLAGS) -c $< -o $@ --endif diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..18da42d @@ -373,17 +165,17 @@ index 0000000..18da42d +env_test_LDADD = libleveldb.la util/libtest.la diff --git a/configure.ac b/configure.ac new file mode 100644 -index 0000000..166fc39 +index 0000000..238bf67 --- /dev/null +++ b/configure.ac @@ -0,0 +1,93 @@ -+AC_INIT([leveldb], [1.5.0], [http://groups.google.com/group/leveldb]) ++AC_INIT([leveldb], [1.7.0], [http://groups.google.com/group/leveldb]) + +AC_CANONICAL_TARGET + +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip tar-ustar foreign]) + -+AC_SUBST(LEVELDB_VERSION_INFO, [1:5:0]) ++AC_SUBST(LEVELDB_VERSION_INFO, [1:7:0]) + +# Checks for programs. +AC_PROG_CXX @@ -538,16 +330,18 @@ index 0000000..1511011 +Libs: -lleveldb diff --git a/port/Makefile.am b/port/Makefile.am new file mode 100644 -index 0000000..8a0b980 +index 0000000..e392c46 --- /dev/null +++ b/port/Makefile.am -@@ -0,0 +1,8 @@ +@@ -0,0 +1,10 @@ +noinst_LTLIBRARIES = libport.la + +libport_la_SOURCES = atomic_pointer.h \ -+ port.h \ -+ port_posix.h \ -+ port_posix.cc ++ port.h \ ++ port_example.h \ ++ port_posix.cc \ ++ port_posix.h \ ++ thread_annotations.h + +libport_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include diff --git a/table/Makefile.am b/table/Makefile.am @@ -578,10 +372,10 @@ index 0000000..239e7ba +libtable_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include diff --git a/util/Makefile.am b/util/Makefile.am new file mode 100644 -index 0000000..bb953e5 +index 0000000..eb637ba --- /dev/null +++ b/util/Makefile.am -@@ -0,0 +1,31 @@ +@@ -0,0 +1,33 @@ +noinst_LTLIBRARIES = libutil.la libtest.la + +libutil_la_SOURCES = arena.h \ @@ -609,10 +403,12 @@ index 0000000..bb953e5 + status.cc + +libtest_la_SOURCES = testharness.cc \ -+ testutil.cc ++ testharness.h \ ++ testutil.cc \ ++ testutil.h + +libutil_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include +libtest_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include -- -1.7.10.4 +1.7.12.1 diff --git a/leveldb-0002-Add-memory-barrier-on-PowerPC.patch b/leveldb-0002-Add-memory-barrier-on-PowerPC.patch new file mode 100644 index 0000000..80b8778 --- /dev/null +++ b/leveldb-0002-Add-memory-barrier-on-PowerPC.patch @@ -0,0 +1,28 @@ +From 766a980c083ab05809620f81985a96f99eb62a13 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sat, 19 May 2012 11:33:43 +0400 +Subject: [PATCH 2/3] Add memory barrier on PowerPC + +Signed-off-by: Peter Lemenkov +--- + port/atomic_pointer.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h +index e17bf43..f1ae174 100644 +--- a/port/atomic_pointer.h ++++ b/port/atomic_pointer.h +@@ -50,8 +50,8 @@ namespace port { + // http://msdn.microsoft.com/en-us/library/ms684208(v=vs.85).aspx + #define LEVELDB_HAVE_MEMORY_BARRIER + +-// Gcc on x86 +-#elif defined(ARCH_CPU_X86_FAMILY) && defined(__GNUC__) ++// GCC on x86, PPC, PPC64, MIPS, MIPS64, s390, S390x, ARM ++#elif defined(__GNUC__) + inline void MemoryBarrier() { + // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on + // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. +-- +1.7.12.1 + diff --git a/leveldb-0002-Add-memory-barrier-on-a-more-arches.patch b/leveldb-0002-Add-memory-barrier-on-a-more-arches.patch deleted file mode 100644 index 00db46c..0000000 --- a/leveldb-0002-Add-memory-barrier-on-a-more-arches.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d024d7fdb808dd4d3e8ad57b83aa3441129c8276 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Sat, 19 May 2012 11:33:43 +0400 -Subject: [PATCH 2/2] Add memory barrier on a more arches - -Signed-off-by: Peter Lemenkov ---- - port/atomic_pointer.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h -index c58bffb..ed9cee3 100644 ---- a/port/atomic_pointer.h -+++ b/port/atomic_pointer.h -@@ -48,8 +48,8 @@ namespace port { - // http://msdn.microsoft.com/en-us/library/ms684208(v=vs.85).aspx - #define LEVELDB_HAVE_MEMORY_BARRIER - --// Gcc on x86 --#elif defined(ARCH_CPU_X86_FAMILY) && defined(__GNUC__) -+// GCC on x86, PPC, PPC64, MIPS, MIPS64, s390, S390x, ARM -+#elif defined(__GNUC__) - inline void MemoryBarrier() { - // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on - // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. --- -1.7.10.4 - diff --git a/leveldb-0003-bloom_test-failure-on-big-endian-archs.patch b/leveldb-0003-bloom_test-failure-on-big-endian-archs.patch new file mode 100644 index 0000000..9a06228 --- /dev/null +++ b/leveldb-0003-bloom_test-failure-on-big-endian-archs.patch @@ -0,0 +1,34 @@ +From 9a96c7148ee9858feddc764dbb70771a5647e687 Mon Sep 17 00:00:00 2001 +From: Yehuda Sadeh +Date: Mon, 2 Jul 2012 14:29:06 -0700 +Subject: [PATCH 3/3] bloom_test failure on big endian archs + +When running bloom_test on big endian machines it fails due to unacceptable +false positive rate. I've looked into the issue and it seems that the +reason for that is that it passes a different input than when it runs on +little endian. When transforming the input to be little endian it behaves +as expected. +This issue holds up inclusion of ceph to debian due to ceph's use of +leveldb. The fix can be to bump up the acceptable false positives. + +https://groups.google.com/d/topic/leveldb/SbVPvl4j4vU/discussion +--- + util/bloom_test.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/bloom_test.cc b/util/bloom_test.cc +index 0bf8e8d..7593cc2 100644 +--- a/util/bloom_test.cc ++++ b/util/bloom_test.cc +@@ -140,7 +140,7 @@ TEST(BloomTest, VaryingLengths) { + fprintf(stderr, "False positives: %5.2f%% @ length = %6d ; bytes = %6d\n", + rate*100.0, length, static_cast(FilterSize())); + } +- ASSERT_LE(rate, 0.02); // Must not be over 2% ++ ASSERT_LE(rate, 0.03); // Must not be over 2% + if (rate > 0.0125) mediocre_filters++; // Allowed, but not too often + else good_filters++; + } +-- +1.7.12.1 + diff --git a/leveldb-1.5-big-endian-test.patch b/leveldb-1.5-big-endian-test.patch deleted file mode 100644 index fbcfb7c..0000000 --- a/leveldb-1.5-big-endian-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://groups.google.com/d/topic/leveldb/SbVPvl4j4vU/discussion - -When running bloom_test on big endian machines it fails due to unacceptable false positive rate. I've looked into the issue and it seems that the reason for that is that it passes a different input than when it runs on little endian. When transforming the input to be little endian it behaves as expected. -This issue holds up inclusion of ceph to debian due to ceph's use of leveldb. The fix can be to bump up the acceptable false positives, e.g.,: - -diff --git a/util/bloom_test.cc b/util/bloom_test.cc -index 4a6ea1b..61323af 100644 ---- a/util/bloom_test.cc -+++ b/util/bloom_test.cc -@@ -139,7 +139,7 @@ TEST(BloomTest, VaryingLengths) { - fprintf(stderr, "False positives: %5.2f%% @ length = %6d ; bytes = %6d\n", - rate*100.0, length, static_cast(FilterSize())); - } -- ASSERT_LE(rate, 0.02); // Must not be over 2% -+ ASSERT_LE(rate, 0.03); // Must not be over 2% - if (rate > 0.0125) mediocre_filters++; // Allowed, but not too often - else good_filters++; - } diff --git a/leveldb.spec b/leveldb.spec index 11bae6a..6f58ad3 100644 --- a/leveldb.spec +++ b/leveldb.spec @@ -1,6 +1,6 @@ Name: leveldb -Version: 1.5.0 -Release: 4%{?dist} +Version: 1.7.0 +Release: 2%{?dist} Summary: A fast and lightweight key/value database library by Google Group: Applications/Databases License: BSD @@ -8,10 +8,10 @@ URL: http://code.google.com/p/leveldb/ Source0: http://leveldb.googlecode.com/files/%{name}-%{version}.tar.gz # Sent upstream - https://code.google.com/p/leveldb/issues/detail?id=101 Patch1: leveldb-0001-Initial-commit-of-the-autotools-stuff.patch -# Sent upstream - https://code.google.com/p/leveldb/issues/detail?id=102 -Patch2: leveldb-0002-Add-memory-barrier-on-a-more-arches.patch +# Temporary workaround for secondary arches +Patch2: leveldb-0002-Add-memory-barrier-on-PowerPC.patch # https://groups.google.com/d/topic/leveldb/SbVPvl4j4vU/discussion -Patch3: leveldb-1.5-big-endian-test.patch +Patch3: leveldb-0003-bloom_test-failure-on-big-endian-archs.patch BuildRequires: snappy-devel BuildRequires: autoconf BuildRequires: automake @@ -54,11 +54,11 @@ rm -f %{buildroot}%{_libdir}/*.la %check -%ifarch armv7hl ppc ppc64 +%ifarch armv7hl # FIXME a couple of tests are failing on these secondary arches make check || true %else -# x86, x86_64, armv5tel, s390, and s390x are fine +# x86, x86_64, armv5tel, ppc, ppc64, ppc64v7 s390, and s390x are fine make check %endif @@ -81,6 +81,12 @@ make check %changelog +* Sat Oct 27 2012 Peter Lemenkov - 1.7.0-2 +- Restored patch no.2 + +* Sat Oct 27 2012 Peter Lemenkov - 1.7.0-1 +- Ver. 1.7.0 (API/ABI compatible bugfix release) + * Tue Aug 21 2012 Dan Horák - 1.5.0-4 - add workaround for big endians eg. s390(x) diff --git a/sources b/sources index 25acfcd..fca0d5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6797e19a0a9f9bb1c1ba356bf89227f0 leveldb-1.5.0.tar.gz +5c3c6cfbb16a21cdbea0db656aa32fec leveldb-1.7.0.tar.gz