db: added recipe for version 6.1

This commit is contained in:
Jerome Duval
2015-06-02 17:57:23 +00:00
parent 6e3e737b47
commit d536bb36ff
2 changed files with 177 additions and 0 deletions

View File

@@ -0,0 +1,98 @@
SUMMARY="The Oracle Berkeley Database"
DESCRIPTION="
The Oracle Berkeley DB family of open source, embeddable databases provides \
developers with fast, reliable, local persistence with zero administration.
"
HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
SRC_URI="http://download.oracle.com/berkeley-db/db-$portVersion.tar.gz"
CHECKSUM_SHA256="822e1591f7f535c5eb16389fbd5c1f14877a9561674cc1d497f1db318ef86107"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
LICENSE="SleepyCat"
COPYRIGHT="1990-2013, Oracle
1990-1995, The Regents of the University of California
1996-1996, The President and Fellows of Harvard University
2000-2005, INRIA - France Telecom"
PROVIDES="
db${secondaryArchSuffix} = $portVersion compat >= 6.1
cmd:db_archive${secondaryArchSuffix}
cmd:db_checkpoint${secondaryArchSuffix}
cmd:db_deadlock${secondaryArchSuffix}
cmd:db_dump${secondaryArchSuffix}
cmd:db_hotbackup${secondaryArchSuffix}
cmd:db_load${secondaryArchSuffix}
cmd:db_log_verify${secondaryArchSuffix}
cmd:db_printlog${secondaryArchSuffix}
cmd:db_recover${secondaryArchSuffix}
cmd:db_replicate${secondaryArchSuffix}
cmd:db_stat${secondaryArchSuffix}
cmd:db_tuner${secondaryArchSuffix}
cmd:db_upgrade${secondaryArchSuffix}
cmd:db_verify${secondaryArchSuffix}
lib:libdb_6.1${secondaryArchSuffix}
lib:libdb_6${secondaryArchSuffix}
lib:libdb${secondaryArchSuffix}
lib:libdb_cxx${secondaryArchSuffix}
lib:libdb_cxx_6.1${secondaryArchSuffix}
lib:libdb_cxx_6${secondaryArchSuffix}
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libstdc++$secondaryArchSuffix
lib:libgcc_s$secondaryArchSuffix
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
"
PATCHES="db-${portVersion}.patch"
SOURCE_DIR="db-${portVersion}"
BUILD()
{
cd build_unix
runConfigure ../dist/configure --enable-cxx
make $jobArgs
}
INSTALL()
{
cd build_unix
make install
# prepare develop/lib
prepareInstalledDevelLibs libdb libdb-6.1 libdb_cxx libdb_cxx-6.1
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
TEST()
{
cd build_unix
#make dbtest
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
db${secondaryArchSuffix}_devel = $portVersion compat >= 6.1
devel:libdb${secondaryArchSuffix} = $portVersion
devel:libdb_6.1${secondaryArchSuffix} = $portVersion
devel:libdb_cxx${secondaryArchSuffix} = $portVersion
devel:libdb_cxx_6.1${secondaryArchSuffix} = $portVersion
"
REQUIRES_devel="
db$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,79 @@
diff --git a/dist/Makefile.in b/dist/Makefile.in
index e90c0c2..60f8aef 100644
--- a/dist/Makefile.in
+++ b/dist/Makefile.in
@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
bindir= @bindir@
includedir=@includedir@
libdir= @libdir@
-docdir= $(prefix)/docs
+docdir= @docdir@
dmode= 755
emode= 555
diff --git a/dist/configure b/dist/configure
index 32b2c66..5d1ed9a 100755
--- a/dist/configure
+++ b/dist/configure
@@ -5122,6 +5122,8 @@ irix*) optimize_flag="-O2"
CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
+haiku*)
+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
osf*) CPPFLAGS="$CPPFLAGS -pthread";;
*qnx*) qnx_build="yes"
$as_echo "#define HAVE_QNX 1" >>confdefs.h
diff --git a/dist/configure.ac b/dist/configure.ac
index 689f3b8..d5d5125 100644
--- a/dist/configure.ac
+++ b/dist/configure.ac
@@ -206,6 +206,8 @@ irix*) optimize_flag="-O2"
CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
mpeix*) CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
+haiku*)
+ LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
osf*) CPPFLAGS="$CPPFLAGS -pthread";;
*qnx*) qnx_build="yes"
AC_DEFINE(HAVE_QNX)
@@ -671,6 +673,9 @@ AC_SEARCH_LIBS(sched_yield, rt)
# The Berkeley DB library calls fdatasync, only available in -lrt on Solaris.
AC_SEARCH_LIBS(fdatasync, rt)
+# Socket only available in -lnetwork on Haiku
+AC_SEARCH_LIBS(socket, network)
+
AC_SEARCH_LIBS(getaddrinfo, nsl socket)
AC_SEARCH_LIBS(hstrerror, resolv)
diff --git a/src/repmgr/repmgr_posix.c b/src/repmgr/repmgr_posix.c
index f803863..e2b93f6 100644
--- a/src/repmgr/repmgr_posix.c
+++ b/src/repmgr/repmgr_posix.c
@@ -571,11 +571,7 @@ __repmgr_wake_main_thread(env)
* PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
*/
int
-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
- socket_t fd;
- db_iovec_t *iovec;
- int buf_count;
- size_t *byte_count_p;
+__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
{
int nw, result;
@@ -593,11 +589,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p)
* PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
*/
int
-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
- socket_t fd;
- db_iovec_t *iovec;
- int buf_count;
- size_t *byte_count_p;
+__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
{
int result;
ssize_t nw;