diff options
author | obache <obache> | 2014-11-21 11:29:52 +0000 |
---|---|---|
committer | obache <obache> | 2014-11-21 11:29:52 +0000 |
commit | 2b5620daef073128c6a33cec140ac41d3f9ff057 (patch) | |
tree | ed4f11276d5c7913df718a062d5d3fbf2cd01543 /databases/kyotocabinet/patches | |
parent | ba51018e9345db378ec669bc9857805977c9974a (diff) | |
download | pkgsrc-2b5620daef073128c6a33cec140ac41d3f9ff057.tar.gz |
Import kyotocabinet-1.2.76 as databases/kyotocabinet.
Kyoto Cabinet is a library of routines for managing a database.
The database is a simple data file containing records, each is
a pair of a key and a value. Every key and value is serial bytes
with variable length. Both binary data and character string can
be used as a key and a value. Each key must be unique within a
database. There is neither concept of data tables nor data types.
Records are organized in hash table or B+ tree.
Diffstat (limited to 'databases/kyotocabinet/patches')
-rw-r--r-- | databases/kyotocabinet/patches/patch-configure | 52 | ||||
-rw-r--r-- | databases/kyotocabinet/patches/patch-kccommon.h | 15 | ||||
-rw-r--r-- | databases/kyotocabinet/patches/patch-kcthread.cc | 15 |
3 files changed, 82 insertions, 0 deletions
diff --git a/databases/kyotocabinet/patches/patch-configure b/databases/kyotocabinet/patches/patch-configure new file mode 100644 index 00000000000..4ec2dcf5af1 --- /dev/null +++ b/databases/kyotocabinet/patches/patch-configure @@ -0,0 +1,52 @@ +$NetBSD: patch-configure,v 1.1 2014/11/21 11:29:52 obache Exp $ + +* prevent unwated overwrite variables + +--- configure.orig 2012-05-24 11:31:45.000000000 +0000 ++++ configure +@@ -2109,12 +2109,12 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C + MYPCFILES="kyotocabinet.pc" + + # Building flags +-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2" +-MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2" +-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I/usr/local/include" ++MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0" ++MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0" ++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" + MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1" +-MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__" +-MYLDFLAGS="-L. -L\$(LIBDIR) -L/usr/local/lib" ++MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D__EXTENSIONS__" ++MYLDFLAGS="-L. -L\$(LIBDIR)" + MYCMDLDFLAGS="" + MYCMDLIBS="" + MYLDLIBPATH="" +@@ -2122,11 +2122,8 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH" + MYPOSTCMD="true" + + # Building paths +-PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH" +-CPATH=".:/usr/local/include:$CPATH" + LIBRARY_PATH=".:/usr/local/lib:$LIBRARY_PATH" + LD_LIBRARY_PATH=".:/usr/local/lib:$LD_LIBRARY_PATH" +-PKG_CONFIG_PATH=".:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" + export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH + + +@@ -3977,15 +3974,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI + + + # System-depending optimization +-printf 'checking for 64-bit availability... ' +-if printf 'main() {}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1 +-then +- MYCFLAGS="-m64 $MYCFLAGS" +- MYCXXFLAGS="-m64 $MYCXXFLAGS" +- printf 'yes\n' +-else +- printf 'no\n' +-fi + if test "$enable_opt" != "no" + then + printf 'checking for CPU optimization availability... ' diff --git a/databases/kyotocabinet/patches/patch-kccommon.h b/databases/kyotocabinet/patches/patch-kccommon.h new file mode 100644 index 00000000000..f50cfbdb3c7 --- /dev/null +++ b/databases/kyotocabinet/patches/patch-kccommon.h @@ -0,0 +1,15 @@ +$NetBSD: patch-kccommon.h,v 1.1 2014/11/21 11:29:52 obache Exp $ + +* NetBSD also missing modfl(3) + +--- kccommon.h.orig 2012-05-24 16:27:59.000000000 +0000 ++++ kccommon.h +@@ -68,7 +68,7 @@ extern "C" { + #define snprintf _snprintf + #endif + +-#if defined(__CYGWIN__) ++#if defined(__CYGWIN__) || defined(__NetBSD__) + inline long double modfl(long double val, long double* iptr) { + double integ; + double fract = std::modf(val, &integ); diff --git a/databases/kyotocabinet/patches/patch-kcthread.cc b/databases/kyotocabinet/patches/patch-kcthread.cc new file mode 100644 index 00000000000..d65260569b6 --- /dev/null +++ b/databases/kyotocabinet/patches/patch-kcthread.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-kcthread.cc,v 1.1 2014/11/21 11:29:52 obache Exp $ + +* NetBSD also use generic method + +--- kcthread.cc.orig 2012-05-24 16:27:59.000000000 +0000 ++++ kcthread.cc +@@ -402,7 +402,7 @@ bool Mutex::lock_try() { + * Try to get the lock. + */ + bool Mutex::lock_try(double sec) { +-#if defined(_SYS_MSVC_) || defined(_SYS_MINGW_) || defined(_SYS_CYGWIN_) || defined(_SYS_MACOSX_) ++#if defined(_SYS_MSVC_) || defined(_SYS_MINGW_) || defined(_SYS_CYGWIN_) || defined(_SYS_MACOSX_) || defined(_SYS_NETBSD_) + _assert_(sec >= 0.0); + if (lock_try()) return true; + double end = time() + sec; |