CVS commit: pkgsrc/databases/db6

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Fri Aug 26 12:31:34 UTC 2016

Modified Files:
        pkgsrc/databases/db6: distinfo
        pkgsrc/databases/db6/patches: patch-dist_configure

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/db6/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/db6/patches/patch-dist_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/db6/distinfo
diff -u pkgsrc/databases/db6/distinfo:1.5 pkgsrc/databases/db6/distinfo:1.6
--- pkgsrc/databases/db6/distinfo:1.5   Thu Aug 25 06:19:29 2016
+++ pkgsrc/databases/db6/distinfo       Fri Aug 26 12:31:34 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/08/25 06:19:29 richard Exp $
+$NetBSD: distinfo,v 1.6 2016/08/26 12:31:34 richard Exp $
 
 SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
 RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93
@@ -6,7 +6,7 @@ SHA512 (db-6.1.26.tar.gz) = 2590ee3d9e30
 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) = f38f66f7662a126c92df658158a7a2280c174edb
+SHA1 (patch-dist_configure) = 3825e3d8ed8c582105dc75f9e1a97971b932e347
 SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
 SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
 SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b

Index: pkgsrc/databases/db6/patches/patch-dist_configure
diff -u pkgsrc/databases/db6/patches/patch-dist_configure:1.2 pkgsrc/databases/db6/patches/patch-dist_configure:1.3
--- pkgsrc/databases/db6/patches/patch-dist_configure:1.2       Thu Aug 25 06:19:29 2016
+++ pkgsrc/databases/db6/patches/patch-dist_configure   Fri Aug 26 12:31:34 2016
@@ -1,6 +1,8 @@
-$NetBSD: patch-dist_configure,v 1.2 2016/08/25 06:19:29 richard Exp $
+$NetBSD: patch-dist_configure,v 1.3 2016/08/26 12:31:34 richard Exp $
 
---- dist/configure.orig        2014-06-10 15:32:54.000000000 +0000
+toolchains differ whether __aarch64__ or __arm64__ should be defined.
+
+--- dist/configure.orig        2015-06-18 20:04:54.000000000 +0000
 +++ dist/configure
 @@ -5235,7 +5235,7 @@ bsdi3*)  CC=${CC-"shlicc2"}
        LIBSO_LIBS="$LIBSO_LIBS -lipc";;
@@ -11,7 +13,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
        CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
        LDFLAGS="$LDFLAGS -pthread";;
  gnu*|k*bsd*-gnu|linux*)
-@@ -7031,7 +7031,7 @@ fi
+@@ -7029,7 +7029,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -20,7 +22,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
                CPPFLAGS="$CPPFLAGS -pthread"
                LDFLAGS="$LDFLAGS -pthread"
        else
-@@ -12353,7 +12353,7 @@ fi
+@@ -12351,7 +12351,7 @@ fi
        hardcode_shlibpath_var=no
        ;;
  
@@ -29,7 +31,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
        ld_shlibs=no
        ;;
  
-@@ -13347,7 +13347,7 @@ dgux*)
+@@ -13345,7 +13345,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -38,7 +40,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
    dynamic_linker=no
    ;;
  
-@@ -13358,7 +13358,7 @@ freebsd* | dragonfly*)
+@@ -13356,7 +13356,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -47,7 +49,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
      *) objformat=elf ;;
      esac
    fi
-@@ -15316,7 +15316,7 @@ fi
+@@ -15314,7 +15314,7 @@ fi
          esac
          ;;
  
@@ -56,7 +58,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
          # C++ shared libraries reported to be fairly broken before
        # switch to ELF
          ld_shlibs_CXX=no
-@@ -17180,7 +17180,7 @@ dgux*)
+@@ -17178,7 +17178,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -65,7 +67,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
    dynamic_linker=no
    ;;
  
-@@ -17191,7 +17191,7 @@ freebsd* | dragonfly*)
+@@ -17189,7 +17189,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -74,7 +76,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
      *) objformat=elf ;;
      esac
    fi
-@@ -17838,7 +17838,7 @@ LIBTOOL="./libtool"
+@@ -17836,7 +17836,7 @@ LIBTOOL="./libtool"
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -83,7 +85,7 @@ $NetBSD: patch-dist_configure,v 1.2 2016
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -18571,7 +18571,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -18569,7 +18569,7 @@ if test "$_JTOPDIR" != "/usr"; then
        aix*)           _JNI_INC_SUBDIRS="aix";;
        bsdi*)          _JNI_INC_SUBDIRS="bsdos";;
        cygwin*)        _JNI_INC_SUBDIRS="win32";;
@@ -92,12 +94,21 @@ $NetBSD: patch-dist_configure,v 1.2 2016
        hp*)            _JNI_INC_SUBDIRS="hp-ux";;
        linux*)         _JNI_INC_SUBDIRS="linux genunix";;
        osf*)           _JNI_INC_SUBDIRS="alpha";;
-@@ -20755,7 +20755,7 @@ if test "$db_cv_mutex" = no; then
+@@ -20753,7 +20753,7 @@ if test "$db_cv_mutex" = no; then
                # avoid these probes for multiprocess pthreads.
                ;;
            *)
 -              if test "$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
++              if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
                        LIBS="$LIBS -lpthread"
  
  if test "$cross_compiling" = yes; then :
+@@ -21993,7 +21993,7 @@ int
+ main ()
+ {
+ 
+-#if defined(__arm64__) && defined(__GNUC__)
++#if (defined(__arm64__) || defined(__aarch64__)) && defined(__GNUC__)
+       return (0);
+ #else
+       FAIL TO COMPILE/LINK