<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/04241a2c8b1bcacee80cd13fa576b264caf79cf1">https://github.com/macports/macports-ports/commit/04241a2c8b1bcacee80cd13fa576b264caf79cf1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 04241a2 db62: new port, version 6.2.32
</span>04241a2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 04241a2c8b1bcacee80cd13fa576b264caf79cf1
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Jun 10 10:48:32 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> db62: new port, version 6.2.32
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/54336
</span>---
databases/db62/Portfile | 113 ++++++++++++++++++
databases/db62/files/patch-src_dbinc_atomic.h.diff | 126 +++++++++++++++++++++
databases/db62/files/patch-yosemite-libtool.diff | 12 ++
3 files changed, 251 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db62/Portfile b/databases/db62/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3127b8f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db62/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,113 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name db62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.2.32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] {}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories databases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license AGPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description The Berkeley DB package, version 6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version 6.2 of the Berkeley Data Base library which \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ offers (key/value) storage with optional concurrent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ access or transactions interface. This port will \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install the AES (American Encryption Standard) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enabled version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.oracle.com/database/berkeley-db/db.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.oracle.com/berkeley-db/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname db-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6a3bc6562aea20184f8ee60800461dca31b50c4f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 45342417
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-yosemite-libtool.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_dbinc_atomic.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.dir ${worksrcpath}/build_unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ../dist/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-cxx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --includedir=\\\${prefix}/include/db${branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --libdir=\\\${prefix}/lib/db${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cxx_stdlibflags {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docdir=${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newbin [regsub {^db_} ${bin} "db${branch}_"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/${bin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${newbin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset sql] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/dbsql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/db${branch}sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant java description {Build the Java API} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform macosx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} requires the Java for Mac OS X development headers."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} == 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Make sure your Xcode installation is complete."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "missing Java headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.subplatform} eq "macosx" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sql description {Build the SQL API} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build with -DSQLITE_ENABLE_COLUMN_METADATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# required by libgda5 to enable Berkeley DB SQL support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -DSQLITE_ENABLE_COLUMN_METADATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tcl description {build Tcl API} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-tcl --with-tcl=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(ppc) --with-mutex=Darwin/_spin_lock_try
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(ppc64) --with-mutex=Darwin/_spin_lock_try
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(i386) --with-mutex=x86/gcc-assembly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(x86_64) --with-mutex=x86_64/gcc-assembly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {(6\.2(?:\.\d+)*)\.tar\.gz}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db62/files/patch-src_dbinc_atomic.h.diff b/databases/db62/files/patch-src_dbinc_atomic.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..966dfd1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db62/files/patch-src_dbinc_atomic.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,126 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://www.databaseusers.com/article/6047407/Bug%3A+Build+failure+on+Linux+with+clang+libc%2B%2B+(atomic+issues)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gist.githubusercontent.com/LnL7/5153b251fd525fe15de69b67e63a6075/raw/7778e9364679093a32dec2908656738e16b6bdcb/clang.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dbinc/atomic.h src/dbinc/atomic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1c714b3..5eb0003 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dbinc/atomic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dbinc/atomic.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * These have no memory barriers; the caller must include them when necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define atomic_read(p) ((p)->value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define atomic_init(p, val) ((p)->value = (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define atomic_init_db(p, val) ((p)->value = (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_ATOMIC_SUPPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,7 +226,7 @@ static inline int __atomic_compare_exchange_int(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define atomic_add(env, p, val) ((p)->value += (val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define atomic_compare_exchange(env, p, oldval, newval) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (DB_ASSERT(env, atomic_read(p) == (oldval)), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(p, (newval)), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(p, (newval)), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define atomic_inc(env, p) __atomic_add_int(env, p, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define atomic_dec(env, p) __atomic_add_int(env, p, -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/mp/mp_fget.c src/mp/mp_fget.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66b9a65..03b474f 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mp/mp_fget.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mp/mp_fget.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -650,7 +650,7 @@ alloc: /* Allocate a new buffer header and data space. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Initialize enough so we can call __memp_bhfree. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alloc_bhp->flags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&alloc_bhp->ref, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&alloc_bhp->ref, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef DIAGNOSTIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __db_errx(env, DB_STR("3025",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -965,7 +965,7 @@ alloc: /* Allocate a new buffer header and data space. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MVCC_MPROTECT(bhp->buf, mfp->pagesize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROT_READ);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&alloc_bhp->ref, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&alloc_bhp->ref, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alloc_bhp->priority = bhp->priority;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alloc_bhp->pgno = bhp->pgno;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/mp/mp_mvcc.c src/mp/mp_mvcc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 11cd164..dfcdc2b 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mp/mp_mvcc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mp/mp_mvcc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -281,7 +281,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(frozen_bhp, bhp, SSZA(BH, buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&frozen_bhp->ref, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&frozen_bhp->ref, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (mutex != MUTEX_INVALID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frozen_bhp->mtx_buf = mutex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -440,7 +440,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alloc_bhp->mtx_buf = mutex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&alloc_bhp->ref, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&alloc_bhp->ref, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_CLR(alloc_bhp, BH_FROZEN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/mp/mp_region.c src/mp/mp_region.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e006c87..11b157d 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mp/mp_region.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mp/mp_region.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -278,7 +278,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (ret);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_TAILQ_INIT(&htab[i].hash_bucket);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&htab[i].hash_page_dirty, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&htab[i].hash_page_dirty, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mtx_base = mtx_prev = MUTEX_INVALID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -332,7 +332,7 @@ no_prealloc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DB_MUTEX_SHARED, &hp->mtx_hash)) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (ret);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_TAILQ_INIT(&hp->hash_bucket);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&hp->hash_page_dirty, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&hp->hash_page_dirty, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_STATISTICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hp->hash_io_wait = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/mutex/mut_method.c src/mutex/mut_method.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5d4b145..19a2489 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mutex/mut_method.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mutex/mut_method.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,7 +479,7 @@ __atomic_compare_exchange_int(env, v, oldval, newval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUTEX_LOCK(env, mtx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = atomic_read(v) == oldval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(v, newval);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(v, newval);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUTEX_UNLOCK(env, mtx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (ret);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/mutex/mut_tas.c src/mutex/mut_tas.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a620aa8..046585c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mutex/mut_tas.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mutex/mut_tas.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@ __db_tas_mutex_init(env, mutex, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SHARED_LATCHES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (F_ISSET(mutexp, DB_MUTEX_SHARED))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&mutexp->sharecount, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&mutexp->sharecount, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (MUTEX_INIT(&mutexp->tas)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -617,7 +617,7 @@ was_not_locked:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_CLR(mutexp, DB_MUTEX_LOCKED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Flush flag update before zeroing count */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MEMBAR_EXIT();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- atomic_init(&mutexp->sharecount, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ atomic_init_db(&mutexp->sharecount, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DB_ASSERT(env, sharecount > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MEMBAR_EXIT();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db62/files/patch-yosemite-libtool.diff b/databases/db62/files/patch-yosemite-libtool.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ec1b044
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db62/files/patch-yosemite-libtool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't accidentally create flat-namespace dylibs on Yosemite (#44596).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/configure.orig 2017-04-13 14:06:13.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dist/configure 2018-06-10 10:32:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10296,7 +10296,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span></pre><pre style='margin:0'>
</pre>