From 17f6d35e902690291b04cede01a615242950a5bd Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 8 Dec 2013 20:04:02 -0600 Subject: [PATCH] db: Add db-4.8.30 port * Needed by things like bitcoind --- dev-db/db/db-4.8.30.recipe | 91 +++++++++++++++++++++++++++++++ dev-db/db/patches/db-4.8.30.patch | 79 +++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 dev-db/db/db-4.8.30.recipe create mode 100644 dev-db/db/patches/db-4.8.30.patch diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe new file mode 100644 index 000000000..7f7651450 --- /dev/null +++ b/dev-db/db/db-4.8.30.recipe @@ -0,0 +1,91 @@ +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_MD5="f80022099c5742cd179343556179aa8c" +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 + cmd:db_archive + cmd:db_checkpoint + cmd:db_deadlock + cmd:db_dump + cmd:db_hotbackup + cmd:db_load + cmd:db_printlog + cmd:db_recover + cmd:db_stat + cmd:db_sql + cmd:db_upgrade + cmd:db_verify + lib:libdb_4.8 + lib:libdb_4 + lib:libdb + lib:libdb_cxx + lib:libdb_cxx_4.8 + lib:libdb_cxx_4 + " +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + 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-4.8 libdb_cxx libdb_cxx-4.8 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + cd build_unix + #make dbtest +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + db${secondaryArchSuffix}_devel = $portVersion + devel:libdb$secondaryArchSuffix = $portVersion + devel:libdb_4.8$secondaryArchSuffix = $portVersion + devel:libdb_cxx$secondaryArchSuffix = $portVersion + devel:libdb_cxx_4.8$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + db$secondaryArchSuffix == $portVersion base + " diff --git a/dev-db/db/patches/db-4.8.30.patch b/dev-db/db/patches/db-4.8.30.patch new file mode 100644 index 000000000..0b176f9b4 --- /dev/null +++ b/dev-db/db/patches/db-4.8.30.patch @@ -0,0 +1,79 @@ +diff --git a/dist/Makefile.in b/dist/Makefile.in +index c4b0739..d3860b4 100644 +--- a/dist/Makefile.in ++++ b/dist/Makefile.in +@@ -11,7 +11,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 295fec1..e05e451 100755 +--- a/dist/configure ++++ b/dist/configure +@@ -4533,6 +4533,8 @@ irix*) optimize_debug="-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 4a99779..85dfb93 100644 +--- a/dist/configure.ac ++++ b/dist/configure.ac +@@ -184,6 +184,8 @@ irix*) optimize_debug="-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) +@@ -519,6 +521,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/repmgr/repmgr_posix.c b/repmgr/repmgr_posix.c +index 741f378..6892469 100644 +--- a/repmgr/repmgr_posix.c ++++ b/repmgr/repmgr_posix.c +@@ -488,11 +488,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; + +@@ -506,11 +502,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) + { + ssize_t nw; +