[pkgsrc/trunk]: pkgsrc/databases Modify conditions of a previous patch to set...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/277202d10296
branches:  trunk
changeset: 351695:277202d10296
user:      richard <richard%pkgsrc.org@localhost>
date:      Thu Aug 25 06:18:57 2016 +0000

description:
Modify conditions of a previous patch to setup.py which fixes
build on aarch64 Linux

Also add '--enable-dbm' to CONFIGURE_ARGS (legacy dbm interface) in
order to be compatible with db4 builds which happens to fix obscure
build errors on aarch64 Linux with packages such as python27.

bump PKGREVISION to pick up change

diffstat:

 databases/db5/Makefile                     |  4 +++-
 databases/db5/distinfo                     |  4 ++--
 databases/db5/patches/patch-ab             |  4 ++--
 databases/db6/Makefile                     |  4 +++-
 databases/db6/distinfo                     |  4 ++--
 databases/db6/patches/patch-dist_configure |  4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diffs (121 lines):

diff -r e7ee7c8b0883 -r 277202d10296 databases/db5/Makefile
--- a/databases/db5/Makefile    Thu Aug 25 00:19:31 2016 +0000
+++ b/databases/db5/Makefile    Thu Aug 25 06:18:57 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/10/09 14:06:05 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/25 06:18:57 richard Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (5.n -> 5.(n+1))
@@ -8,6 +8,7 @@
 
 DISTNAME=      db-5.3.28
 PKGNAME=       ${DISTNAME:S/db/db5/}
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://download.oracle.com/berkeley-db/ \
                http://download-uk.oracle.com/berkeley-db/
@@ -25,6 +26,7 @@
 CONFIGURE_DIRS=                build_unix
 CONFIGURE_SCRIPT=      ../dist/configure
 CONFIGURE_ARGS+=       --enable-compat185
+CONFIGURE_ARGS+=       --enable-dbm
 CONFIGURE_ARGS+=       --enable-cxx
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/db5
 CONFIGURE_ARGS+=       --program-transform-name=s,db_,db5_,
diff -r e7ee7c8b0883 -r 277202d10296 databases/db5/distinfo
--- a/databases/db5/distinfo    Thu Aug 25 00:19:31 2016 +0000
+++ b/databases/db5/distinfo    Thu Aug 25 06:18:57 2016 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 01:56:11 agc Exp $
+$NetBSD: distinfo,v 1.13 2016/08/25 06:18:57 richard Exp $
 
 SHA1 (db-5.3.28.tar.gz) = fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9
 RMD160 (db-5.3.28.tar.gz) = a4898908ef6dccb137df02e43843f7d3cfab6a3c
 SHA512 (db-5.3.28.tar.gz) = e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 Size (db-5.3.28.tar.gz) = 35090431 bytes
 SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
-SHA1 (patch-ab) = b09fac68d7d847c5660078de90a16f27268e9858
+SHA1 (patch-ab) = 00e496b6dae87363ab1a0ee6b36e732f6ddb0509
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
 SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0
 SHA1 (patch-src_dbinc_atomic.h) = c4fbe421d2c8ba68dc81aeeda1cad09a2c68fbe5
diff -r e7ee7c8b0883 -r 277202d10296 databases/db5/patches/patch-ab
--- a/databases/db5/patches/patch-ab    Thu Aug 25 00:19:31 2016 +0000
+++ b/databases/db5/patches/patch-ab    Thu Aug 25 06:18:57 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2014/04/22 14:42:35 asau Exp $
+$NetBSD: patch-ab,v 1.6 2016/08/25 06:18:57 richard Exp $
 
 --- dist/configure.orig        2012-05-11 17:57:48.000000000 +0000
 +++ dist/configure
@@ -97,7 +97,7 @@
                ;;
            *)
 -              if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
-+              if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
++              if test "$ac_cv_lib_pthread_main" = yes -o "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
                        LIBS="$LIBS -lpthread"
  
  if test "$cross_compiling" = yes; then :
diff -r e7ee7c8b0883 -r 277202d10296 databases/db6/Makefile
--- a/databases/db6/Makefile    Thu Aug 25 00:19:31 2016 +0000
+++ b/databases/db6/Makefile    Thu Aug 25 06:18:57 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/09/14 10:52:57 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/25 06:19:29 richard Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (6.n -> 6.(n+1))
@@ -8,6 +8,7 @@
 
 DISTNAME=      db-6.1.26
 PKGNAME=       ${DISTNAME:S/db/db6/}
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://download.oracle.com/berkeley-db/
 
@@ -23,6 +24,7 @@
 CONFIGURE_DIRS=                build_unix
 CONFIGURE_SCRIPT=      ../dist/configure
 CONFIGURE_ARGS+=       --enable-compat185
+CONFIGURE_ARGS+=       --enable-dbm
 CONFIGURE_ARGS+=       --enable-cxx
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/db6
 CONFIGURE_ARGS+=       --program-transform-name=s,db_,db6_,
diff -r e7ee7c8b0883 -r 277202d10296 databases/db6/distinfo
--- a/databases/db6/distinfo    Thu Aug 25 00:19:31 2016 +0000
+++ b/databases/db6/distinfo    Thu Aug 25 06:18:57 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:56:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/08/25 06:19:29 richard Exp $
 
 SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
 RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93
@@ -6,7 +6,7 @@
 Size (db-6.1.26.tar.gz) = 37495772 bytes
 SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e
 SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
-SHA1 (patch-dist_configure) = 2fb4c6cdd29ac5a9ad520af411517660b24e8768
+SHA1 (patch-dist_configure) = f38f66f7662a126c92df658158a7a2280c174edb
 SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
 SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
 SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b
diff -r e7ee7c8b0883 -r 277202d10296 databases/db6/patches/patch-dist_configure
--- a/databases/db6/patches/patch-dist_configure        Thu Aug 25 00:19:31 2016 +0000
+++ b/databases/db6/patches/patch-dist_configure        Thu Aug 25 06:18:57 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-dist_configure,v 1.1 2015/01/01 18:52:52 ryoon Exp $
+$NetBSD: patch-dist_configure,v 1.2 2016/08/25 06:19:29 richard Exp $
 
 --- dist/configure.orig        2014-06-10 15:32:54.000000000 +0000
 +++ dist/configure
@@ -97,7 +97,7 @@
                ;;
            *)
 -              if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
-+              if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
++              if test "$ac_cv_lib_pthread_main" = yes -o "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
                        LIBS="$LIBS -lpthread"
  
  if test "$cross_compiling" = yes; then :