Fri Aug 26 12:31:34 2016 UTC ()
redo patch update for __aarch64__ as the real problem is that only __arm64__
was being checked and not the gcc toolchain's use of __aarch64__.
db6 does support the 64-bit ARM platform.

previous condition put back as it was prior.
ride PKGREVISION bump


(richard)
diff -r1.5 -r1.6 pkgsrc/databases/db6/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/db6/patches/patch-dist_configure
cvs diff -r1.5 -r1.6 pkgsrc/databases/db6/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/db6/distinfo 2016/08/25 06:19:29 1.5
+++ pkgsrc/databases/db6/distinfo 2016/08/26 12:31:34 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.5 2016/08/25 06:19:29 richard Exp $ 1$NetBSD: distinfo,v 1.6 2016/08/26 12:31:34 richard Exp $
2 2
3SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2 3SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
4RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93 4RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93
5SHA512 (db-6.1.26.tar.gz) = 2590ee3d9e30e6eaeb350edbc2fa7400582c0b520177fe0a3a57a966573268e18ad10b1dc6dee3fb1be9c93ac6f96f848c120793eaf873562464edd125cff4d4 5SHA512 (db-6.1.26.tar.gz) = 2590ee3d9e30e6eaeb350edbc2fa7400582c0b520177fe0a3a57a966573268e18ad10b1dc6dee3fb1be9c93ac6f96f848c120793eaf873562464edd125cff4d4
6Size (db-6.1.26.tar.gz) = 37495772 bytes 6Size (db-6.1.26.tar.gz) = 37495772 bytes
7SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e 7SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e
8SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e 8SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
9SHA1 (patch-dist_configure) = f38f66f7662a126c92df658158a7a2280c174edb 9SHA1 (patch-dist_configure) = 3825e3d8ed8c582105dc75f9e1a97971b932e347
10SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23 10SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
11SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da 11SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
12SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b 12SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b
13SHA1 (patch-src_mp_mp__mvcc.c) = 7a543c4e56d72bba607d6e8ec6b667b944e418f1 13SHA1 (patch-src_mp_mp__mvcc.c) = 7a543c4e56d72bba607d6e8ec6b667b944e418f1
14SHA1 (patch-src_mp_mp__region.c) = bba0d8e3046d5d571ec00e8b07d7d10a375e6057 14SHA1 (patch-src_mp_mp__region.c) = bba0d8e3046d5d571ec00e8b07d7d10a375e6057
15SHA1 (patch-src_mutex_mut__method.c) = 5a8695160913f6a70be39c02aff7a4c7240fec6b 15SHA1 (patch-src_mutex_mut__method.c) = 5a8695160913f6a70be39c02aff7a4c7240fec6b
16SHA1 (patch-src_mutex_mut__tas.c) = 3bf893026bfc0878fe35050b8339c5a6a59f95e6 16SHA1 (patch-src_mutex_mut__tas.c) = 3bf893026bfc0878fe35050b8339c5a6a59f95e6
cvs diff -r1.2 -r1.3 pkgsrc/databases/db6/patches/patch-dist_configure (expand / switch to unified diff)

--- pkgsrc/databases/db6/patches/patch-dist_configure 2016/08/25 06:19:29 1.2
+++ pkgsrc/databases/db6/patches/patch-dist_configure 2016/08/26 12:31:34 1.3
@@ -1,103 +1,114 @@ @@ -1,103 +1,114 @@
1$NetBSD: patch-dist_configure,v 1.2 2016/08/25 06:19:29 richard Exp $ 1$NetBSD: patch-dist_configure,v 1.3 2016/08/26 12:31:34 richard Exp $
2 2
3--- dist/configure.orig 2014-06-10 15:32:54.000000000 +0000 3toolchains differ whether __aarch64__ or __arm64__ should be defined.
 4
 5--- dist/configure.orig 2015-06-18 20:04:54.000000000 +0000
4+++ dist/configure 6+++ dist/configure
5@@ -5235,7 +5235,7 @@ bsdi3*) CC=${CC-"shlicc2"} 7@@ -5235,7 +5235,7 @@ bsdi3*) CC=${CC-"shlicc2"}
6 LIBSO_LIBS="$LIBSO_LIBS -lipc";; 8 LIBSO_LIBS="$LIBSO_LIBS -lipc";;
7 cygwin*) 9 cygwin*)
8 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; 10 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
9-freebsd*) 11-freebsd*)
10+freebsd*|dragonfly*) 12+freebsd*|dragonfly*)
11 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" 13 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
12 LDFLAGS="$LDFLAGS -pthread";; 14 LDFLAGS="$LDFLAGS -pthread";;
13 gnu*|k*bsd*-gnu|linux*) 15 gnu*|k*bsd*-gnu|linux*)
14@@ -7031,7 +7031,7 @@ fi 16@@ -7029,7 +7029,7 @@ fi
15 # we're using. 17 # we're using.
16 case "$host_os" in 18 case "$host_os" in
17 sysv5UnixWare*|sysv5OpenUNIX8*) 19 sysv5UnixWare*|sysv5OpenUNIX8*)
18- if test "$GCC" == "yes"; then 20- if test "$GCC" == "yes"; then
19+ if test "$GCC" = "yes"; then 21+ if test "$GCC" = "yes"; then
20 CPPFLAGS="$CPPFLAGS -pthread" 22 CPPFLAGS="$CPPFLAGS -pthread"
21 LDFLAGS="$LDFLAGS -pthread" 23 LDFLAGS="$LDFLAGS -pthread"
22 else 24 else
23@@ -12353,7 +12353,7 @@ fi 25@@ -12351,7 +12351,7 @@ fi
24 hardcode_shlibpath_var=no 26 hardcode_shlibpath_var=no
25 ;; 27 ;;
26  28
27- freebsd1*) 29- freebsd1*)
28+ freebsd1*|freebsd1.*) 30+ freebsd1*|freebsd1.*)
29 ld_shlibs=no 31 ld_shlibs=no
30 ;; 32 ;;
31  33
32@@ -13347,7 +13347,7 @@ dgux*) 34@@ -13345,7 +13345,7 @@ dgux*)
33 shlibpath_var=LD_LIBRARY_PATH 35 shlibpath_var=LD_LIBRARY_PATH
34 ;; 36 ;;
35  37
36-freebsd1*) 38-freebsd1*)
37+freebsd1*|freebsd1.*) 39+freebsd1*|freebsd1.*)
38 dynamic_linker=no 40 dynamic_linker=no
39 ;; 41 ;;
40  42
41@@ -13358,7 +13358,7 @@ freebsd* | dragonfly*) 43@@ -13356,7 +13356,7 @@ freebsd* | dragonfly*)
42 objformat=`/usr/bin/objformat` 44 objformat=`/usr/bin/objformat`
43 else 45 else
44 case $host_os in 46 case $host_os in
45- freebsd[123]*) objformat=aout ;; 47- freebsd[123]*) objformat=aout ;;
46+ freebsd[123]*|freebsd[123].*) objformat=aout ;; 48+ freebsd[123]*|freebsd[123].*) objformat=aout ;;
47 *) objformat=elf ;; 49 *) objformat=elf ;;
48 esac 50 esac
49 fi 51 fi
50@@ -15316,7 +15316,7 @@ fi 52@@ -15314,7 +15314,7 @@ fi
51 esac 53 esac
52 ;; 54 ;;
53  55
54- freebsd[12]*) 56- freebsd[12]*)
55+ freebsd[12]*|freebsd[12].*) 57+ freebsd[12]*|freebsd[12].*)
56 # C++ shared libraries reported to be fairly broken before 58 # C++ shared libraries reported to be fairly broken before
57 # switch to ELF 59 # switch to ELF
58 ld_shlibs_CXX=no 60 ld_shlibs_CXX=no
59@@ -17180,7 +17180,7 @@ dgux*) 61@@ -17178,7 +17178,7 @@ dgux*)
60 shlibpath_var=LD_LIBRARY_PATH 62 shlibpath_var=LD_LIBRARY_PATH
61 ;; 63 ;;
62  64
63-freebsd1*) 65-freebsd1*)
64+freebsd1*|freebsd1.*) 66+freebsd1*|freebsd1.*)
65 dynamic_linker=no 67 dynamic_linker=no
66 ;; 68 ;;
67  69
68@@ -17191,7 +17191,7 @@ freebsd* | dragonfly*) 70@@ -17189,7 +17189,7 @@ freebsd* | dragonfly*)
69 objformat=`/usr/bin/objformat` 71 objformat=`/usr/bin/objformat`
70 else 72 else
71 case $host_os in 73 case $host_os in
72- freebsd[123]*) objformat=aout ;; 74- freebsd[123]*) objformat=aout ;;
73+ freebsd[123]*|freebsd[123].*) objformat=aout ;; 75+ freebsd[123]*|freebsd[123].*) objformat=aout ;;
74 *) objformat=elf ;; 76 *) objformat=elf ;;
75 esac 77 esac
76 fi 78 fi
77@@ -17838,7 +17838,7 @@ LIBTOOL="./libtool" 79@@ -17836,7 +17836,7 @@ LIBTOOL="./libtool"
78 INSTALLER="\$(LIBTOOL) --mode=install cp -p" 80 INSTALLER="\$(LIBTOOL) --mode=install cp -p"
79  81
80 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" 82 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
81-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" 83-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
82+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" 84+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
83 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" 85 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
84 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" 86 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
85 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" 87 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
86@@ -18571,7 +18571,7 @@ if test "$_JTOPDIR" != "/usr"; then 88@@ -18569,7 +18569,7 @@ if test "$_JTOPDIR" != "/usr"; then
87 aix*) _JNI_INC_SUBDIRS="aix";; 89 aix*) _JNI_INC_SUBDIRS="aix";;
88 bsdi*) _JNI_INC_SUBDIRS="bsdos";; 90 bsdi*) _JNI_INC_SUBDIRS="bsdos";;
89 cygwin*) _JNI_INC_SUBDIRS="win32";; 91 cygwin*) _JNI_INC_SUBDIRS="win32";;
90- freebsd*) _JNI_INC_SUBDIRS="freebsd";; 92- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
91+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";; 93+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";;
92 hp*) _JNI_INC_SUBDIRS="hp-ux";; 94 hp*) _JNI_INC_SUBDIRS="hp-ux";;
93 linux*) _JNI_INC_SUBDIRS="linux genunix";; 95 linux*) _JNI_INC_SUBDIRS="linux genunix";;
94 osf*) _JNI_INC_SUBDIRS="alpha";; 96 osf*) _JNI_INC_SUBDIRS="alpha";;
95@@ -20755,7 +20755,7 @@ if test "$db_cv_mutex" = no; then 97@@ -20753,7 +20753,7 @@ if test "$db_cv_mutex" = no; then
96 # avoid these probes for multiprocess pthreads. 98 # avoid these probes for multiprocess pthreads.
97 ;; 99 ;;
98 *) 100 *)
99- if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then 101- if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
100+ if test "$ac_cv_lib_pthread_main" = yes -o "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then 102+ if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
101 LIBS="$LIBS -lpthread" 103 LIBS="$LIBS -lpthread"
102  104
103 if test "$cross_compiling" = yes; then : 105 if test "$cross_compiling" = yes; then :
 106@@ -21993,7 +21993,7 @@ int
 107 main ()
 108 {
 109
 110-#if defined(__arm64__) && defined(__GNUC__)
 111+#if (defined(__arm64__) || defined(__aarch64__)) && defined(__GNUC__)
 112 return (0);
 113 #else
 114 FAIL TO COMPILE/LINK