db: Update to 6.2.32

Drop all patches, seems to build fine here, and java/tcl are disabled anyway.
This commit is contained in:
Christoph Reiter 2022-12-19 21:03:55 +01:00
parent b3d523b447
commit de8fd37d95
4 changed files with 5 additions and 62 deletions

View File

@ -1,21 +0,0 @@
--- origsrc/db-5.3.21/dist/aclocal_java/ac_jni_include_dirs.m4 2012-05-11 12:57:48.000000000 -0500
+++ src/db-5.3.21/dist/aclocal_java/ac_jni_include_dirs.m4 2013-03-08 00:21:17.541594900 -0600
@@ -75,7 +75,6 @@ if test "$_JTOPDIR" != "/usr"; then
case "$host_os" in
aix*) _JNI_INC_SUBDIRS="aix";;
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
- cygwin*) _JNI_INC_SUBDIRS="win32";;
freebsd*) _JNI_INC_SUBDIRS="freebsd";;
hp*) _JNI_INC_SUBDIRS="hp-ux";;
linux*) _JNI_INC_SUBDIRS="linux genunix";;
--- origsrc/db-5.3.21/dist/configure.ac 2012-05-11 12:57:48.000000000 -0500
+++ src/db-5.3.21/dist/configure.ac 2013-03-08 00:20:48.257920000 -0600
@@ -435,7 +435,7 @@ if test "$db_cv_java" = "yes" -o "$db_cv
# A classpath that includes . is needed to check for Java
# Since Cygwin uses Windows' javac, we need Windows path separators
case "$host_os" in
- cygwin*) CLASSPATH=".;$CLASSPATH";;
+ mingw*) CLASSPATH=".;$CLASSPATH";;
*) CLASSPATH=".:$CLASSPATH";;
esac
export CLASSPATH

View File

@ -1,11 +0,0 @@
--- origsrc/db-5.3.21/dist/aclocal/tcl.m4 2012-05-11 12:57:48.000000000 -0500
+++ src/db-5.3.21/dist/aclocal/tcl.m4 2013-03-08 00:21:33.268494500 -0600
@@ -107,7 +107,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
# given by the Tcl spec are insufficient for our use. [#5779],[#17109]
#
case "$host_os" in
- aix*)
+ aix*|cygwin*)
LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG"
LIBTSO_LIBS="$LIBTSO_LIBS -L$TCL_EXEC_PREFIX/lib -ltcl$TCL_VERSION";;
esac

View File

@ -1,11 +0,0 @@
--- src/db-5.2.38/dist/aclocal/sql.m4.orig 2014-10-03 16:21:14.838769800 +0900
+++ src/db-5.2.38/dist/aclocal/sql.m4 2014-10-03 16:25:09.722632200 +0900
@@ -96,7 +96,7 @@
# !!! END COPIED from autoconf distribution
sqlite_dir=$srcdir/../lang/sql/sqlite
-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1
+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1
# Configure JDBC if --enable-jdbc
if test "$db_cv_jdbc" != "no"; then

View File

@ -1,35 +1,21 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=('db' 'libdb' 'libdb-devel' 'db-docs')
pkgver=5.3.28
pkgrel=4
pkgver=6.2.32
pkgrel=1
pkgdesc="The Berkeley DB embedded database system"
url="https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
license=('custom')
license=('spdx:AGPL-3.0-or-later')
arch=('i686' 'x86_64')
depends=('sh')
makedepends=('autotools' 'gcc')
source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz
#http://download.oracle.com/otn/berkeley-db/db-${pkgver}.tar.gz
5.3-java.patch
5.3-tcl.patch
5.3-vpath.patch
https://src.fedoraproject.org/rpms/libdb/raw/d6841b3b46a51db98c162347211a5a64d154ea37/f/db-5.3.28-atomic_compare_exchange.patch)
source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
options=('!makeflags')
sha256sums=('e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628'
'a925b88e58cff6d4aeed3eecfa2cf4c606f2ed469607d8fd0c5c0a9c4b5a8bd1'
'2166bac574f60d42fe6dd6c03223d6595accf303375be397e277b38676b8cb08'
'7614933d2770c2aa6864cd731c114b90a4e4c1a8a988daabd9b6f203ab8f1f21'
'eb58b5764e16c6f81df8ff80964ef2e071ca5cbb9e24d37f45a831107afb68cc')
sha256sums=('a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np2 -i ${srcdir}/5.3-java.patch
patch -Np2 -i ${srcdir}/5.3-tcl.patch
patch -Np2 -i ${srcdir}/5.3-vpath.patch
patch -Np1 -i ${srcdir}/db-5.3.28-atomic_compare_exchange.patch
cd dist
ac_macrodir=aclocal libtoolize --copy --force --install
./s_config