Attachment 654036 Details for Bug 881608 – Applied patch for allow leveldbjni build

[patch] Applied patch for allow leveldbjni build

0001-Applied-patch-for-allow-leveldbjni-build.patch (text/plain), 3.09 KB, created by gil cattaneo on 2012-11-29 08:07:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-11-29 08:07:48 UTC

Size: 3.09 KB

patch

obsolete

>From 48f8bb7d7511113f65506e149089de9cdc978ce3 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Thu, 29 Nov 2012 08:47:32 +0100
>Subject: [PATCH] Applied patch for allow leveldbjni build
>
>---
> leveldb-0004-leveldbjni.patch |   26 ++++++++++++++++++++++++++
> leveldb.spec                  |    9 +++++++--
> 2 files changed, 33 insertions(+), 2 deletions(-)
> create mode 100644 leveldb-0004-leveldbjni.patch
>
>diff --git a/leveldb-0004-leveldbjni.patch b/leveldb-0004-leveldbjni.patch
>new file mode 100644
>index 0000000..55e5a00
>--- /dev/null
>+++ b/leveldb-0004-leveldbjni.patch
>@@ -0,0 +1,26 @@
>+diff -Nru leveldb-1.7.0/build_detect_platform leveldb-1.7.0-gil/build_detect_platform
>+--- leveldb-1.7.0/build_detect_platform	2012-10-17 01:12:49.000000000 +0200
>++++ leveldb-1.7.0-gil/build_detect_platform	2012-11-28 17:57:09.341801632 +0100
>+@@ -194,8 +194,9 @@
>+ echo "PLATFORM=$PLATFORM" >> $OUTPUT
>+ echo "PLATFORM_LDFLAGS=$PLATFORM_LDFLAGS" >> $OUTPUT
>+ echo "PLATFORM_LIBS=$PLATFORM_LIBS" >> $OUTPUT
>+-echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
>+-echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
>++echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS $PLATFORM_SHARED_CFLAGS" >> $OUTPUT
>++echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS $PLATFORM_SHARED_CFLAGS" >> $OUTPUT
>++echo "PLATFORM_SHARED_CFLAGS=" >> $OUTPUT
>+ echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
>+ echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
>+ echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
>+diff -Nru leveldb-1.7.0/include/leveldb/slice.h leveldb-1.7.0-gil/include/leveldb/slice.h
>+--- leveldb-1.7.0/include/leveldb/slice.h	2012-10-17 01:12:50.000000000 +0200
>++++ leveldb-1.7.0-gil/include/leveldb/slice.h	2012-11-28 17:52:27.747714857 +0100
>+@@ -77,7 +77,6 @@
>+             (memcmp(data_, x.data_, x.size_) == 0));
>+   }
>+ 
>+- private:
>+   const char* data_;
>+   size_t size_;
>+ 
>diff --git a/leveldb.spec b/leveldb.spec
>index 9d76929..bca7cd0 100644
>--- a/leveldb.spec
>+++ b/leveldb.spec
>@@ -1,6 +1,6 @@
> Name:		leveldb
> Version:	1.7.0
>-Release:	3%{?dist}
>+Release:	4%{?dist}
> Summary:	A fast and lightweight key/value database library by Google
> Group:		Applications/Databases
> License:	BSD
>@@ -12,6 +12,8 @@ Patch1:		leveldb-0001-Initial-commit-of-the-autotools-stuff.patch
> Patch2:		leveldb-0002-Add-memory-barrier-on-PowerPC.patch
> # https://groups.google.com/d/topic/leveldb/SbVPvl4j4vU/discussion
> Patch3:		leveldb-0003-bloom_test-failure-on-big-endian-archs.patch
>+# available in https://github.com/fusesource/leveldbjni/blob/leveldbjni-[LEVELDBJNI VERSION]/leveldb.patch
>+Patch4:		leveldb-0004-leveldbjni.patch
> BuildRequires:	snappy-devel
> BuildRequires:	autoconf
> BuildRequires:	automake
>@@ -40,7 +42,7 @@ Additional header files for development with %{name}.
> %patch1 -p1
> %patch2 -p1
> %patch3 -p1
>-
>+%patch4 -p1
> 
> %build
> autoreconf -ivf
>@@ -81,6 +83,9 @@ make check
> 
> 
> %changelog
>+* Thu Nov 29 2012 gil cattaneo <puntogil@libero.it> - 1.7.0-4
>+- Applied patch for allow leveldbjni build
>+
> * Sat Oct 27 2012 Peter Lemenkov <lemenkov@gmail.com> - 1.7.0-3
> - Dirty workarounds for failed tests on ARM
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 881608: 654036