rpm/kyotocabinet
SHA256
1
0
Fork 0
forked from pool/kyotocabinet
Code Pull Requests Activity

Accepting request 397912 from home:marxin:branches:devel:libraries:c_c++

Browse Source 
Fix errors seen by GCC6.

OBS-URL: https://build.opensuse.org/request/show/397912
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/kyotocabinet?expand=0&rev=15
This commit is contained in:
Dirk Mueller 2016-05-25 10:45:15 +00:00 committed by Git OBS Bridge
parent 76955332a1
commit 5b0358e6d1
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc6-fix-errors.patch Normal file
View File

@ -0,0 +1,11 @@
--- kyotocabinet-1.2.76/kcdbext.h 2016-05-25 11:32:53.591866016 +0200
+++ kyotocabinet-1.2.76/kcdbext.h 2012-05-24 18:27:59.000000000 +0200
@@ -1278,7 +1278,7 @@
if (omode_ == 0) {
set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
*sp = 0;
- return false;
+ return '\0';
}
if (!cache_) return db_.get(kbuf, ksiz, sp);
size_t dvsiz = 0;

5
kyotocabinet.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 25 09:38:17 UTC 2016 - martin.liska@suse.com
- Add gcc6-fix-errors.patch to remove errors seen by GCC6.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 4 16:30:01 UTC 2013 - jengelh@inai.de Fri Jan 4 16:30:01 UTC 2013 - jengelh@inai.de

5
kyotocabinet.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package kyotocabinet # spec file for package kyotocabinet
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,8 @@ Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: %{name}-fix_rpath.patch Patch1: %{name}-fix_rpath.patch
Patch2: configure-8-byte-atomics.patch Patch2: configure-8-byte-atomics.patch
# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6.
Patch3: gcc6-fix-errors.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -107,6 +109,7 @@ Kyoto Cabinet within a proprietary software, the commercial license is required.
%setup -q %setup -q
%patch1 -p 1 %patch1 -p 1
%patch2 -p1 %patch2 -p1
%patch3 -p1
sed -ie "/ldconfig/d" Makefile.in sed -ie "/ldconfig/d" Makefile.in
sed -ie "/DOCDIR/d" Makefile.in sed -ie "/DOCDIR/d" Makefile.in