pool/kyotocabinet
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 485007 from home:elvigia:branches:devel:libraries:c_c++

Browse Source 
- kyotocabinet-fix-debuginfo.patch: Fix debuginfo generation
- gcc6-fix-errors.patch: return NULL instead, make GCC7 happy

OBS-URL: https://build.opensuse.org/request/show/485007
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/kyotocabinet?expand=0&rev=17
This commit is contained in:
Dirk Mueller 2017-04-05 11:38:17 +00:00 committed by Git OBS Bridge
parent b1083d97b1
commit 1d9173a4f0
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc6-fix-errors.patch
View File

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

15
kyotocabinet-fix-debuginfo.patch Normal file
View File

@ -0,0 +1,15 @@
Index: kyotocabinet-1.2.76/configure.in
===================================================================
--- kyotocabinet-1.2.76.orig/configure.in
+++ kyotocabinet-1.2.76/configure.in
@@ -35,8 +35,8 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C
MYPCFILES="kyotocabinet.pc"
# Building flags
-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
-MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2"
+MYCFLAGS="-Wall -fPIC -fsigned-char "
+MYCXXFLAGS="-Wall -fPIC -fsigned-char -fvisibility-inlines-hidden"
MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"

6
kyotocabinet.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 4 03:47:22 UTC 2017 - crrodriguez@opensuse.org
- kyotocabinet-fix-debuginfo.patch: Fix debuginfo generation
- gcc6-fix-errors.patch: return NULL instead, make GCC7 happy
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 25 09:38:17 UTC 2016 - martin.liska@suse.com Wed May 25 09:38:17 UTC 2016 - martin.liska@suse.com

7
kyotocabinet.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package kyotocabinet # spec file for package kyotocabinet
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 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,8 +28,10 @@ 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. # PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6/GCC7.
Patch3: gcc6-fix-errors.patch Patch3: gcc6-fix-errors.patch
# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Do not supress debuginfo
Patch4: kyotocabinet-fix-debuginfo.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -110,6 +112,7 @@ Kyoto Cabinet within a proprietary software, the commercial license is required.
%patch1 -p 1 %patch1 -p 1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -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