CVS commit: pkgsrc/databases/db4

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Oct 20 23:31:38 UTC 2025

Modified Files:
        pkgsrc/databases/db4: distinfo
        pkgsrc/databases/db4/patches: patch-dbinc_atomic.h

Log Message:
add a missing prototype in a specific case that comes up on arm64.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/databases/db4/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/db4/patches/patch-dbinc_atomic.h

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

Modified files:

Index: pkgsrc/databases/db4/distinfo
diff -u pkgsrc/databases/db4/distinfo:1.50 pkgsrc/databases/db4/distinfo:1.51
--- pkgsrc/databases/db4/distinfo:1.50  Tue Jun 18 12:49:22 2024
+++ pkgsrc/databases/db4/distinfo       Mon Oct 20 23:31:37 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2024/06/18 12:49:22 markd Exp $
+$NetBSD: distinfo,v 1.51 2025/10/20 23:31:37 mrg Exp $
 
 BLAKE2s (db-4.8.30.tar.gz) = 0f2f1b2e53dbabd4c34a4df9dbf91f9051a24375bbbfb75c56372bb3af1ca979
 SHA512 (db-4.8.30.tar.gz) = d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 045a3b83b9c6c164382ec5
 SHA1 (patch-ae) = e47582c71470386a5226408e4d1db31adccadc29
 SHA1 (patch-af) = d9706895e538468f3b442fde3e8d6c9caceaaf4f
 SHA1 (patch-db__sql_sqlite_sqliteInt.h) = 7e5579d6c55c8163e35718bdecbce079b1efde3e
-SHA1 (patch-dbinc_atomic.h) = d68db1b7e07b35ec070a18f0195b9f3b386114dd
+SHA1 (patch-dbinc_atomic.h) = 3397a98c00655a44b7ad09fea78053785b1a42d8
 SHA1 (patch-dist_s__sig) = d891a6fabd27a07776bdaa21843563638ecb89f2
 SHA1 (patch-env_env__sig.c) = 93199a4147de946d1285fa006c751f4569f2cdb5
 SHA1 (patch-mp_mp__fget.c) = 697955fec5e492ba22c1bf6832527d115c3782ad

Index: pkgsrc/databases/db4/patches/patch-dbinc_atomic.h
diff -u pkgsrc/databases/db4/patches/patch-dbinc_atomic.h:1.2 pkgsrc/databases/db4/patches/patch-dbinc_atomic.h:1.3
--- pkgsrc/databases/db4/patches/patch-dbinc_atomic.h:1.2       Tue Sep  8 18:51:27 2015
+++ pkgsrc/databases/db4/patches/patch-dbinc_atomic.h   Mon Oct 20 23:31:37 2025
@@ -1,12 +1,15 @@
-$NetBSD: patch-dbinc_atomic.h,v 1.2 2015/09/08 18:51:27 joerg Exp $
+$NetBSD: patch-dbinc_atomic.h,v 1.3 2025/10/20 23:31:37 mrg Exp $
 
 Don't define inline functions in the protected namespace.
 This conflicts with Clang builtins.
 
 Avoid overlap with stdatomic.h, the C++ binding uses <atomic>.
 
---- dbinc/atomic.h.orig        2010-04-12 20:25:22.000000000 +0000
-+++ dbinc/atomic.h
+Add missing prototype for atomic_compare_exchange() in one case.
+
+
+--- dbinc/atomic.h.orig        2010-04-12 13:25:22.000000000 -0700
++++ dbinc/atomic.h     2025-10-20 15:41:35.592099178 -0700
 @@ -70,7 +70,7 @@ typedef struct {
   * These have no memory barriers; the caller must include them when necessary.
   */
@@ -47,7 +50,7 @@ Avoid overlap with stdatomic.h, the C++ 
        db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
  {
        atomic_value_t was;
-@@ -206,7 +202,7 @@ static inline int __atomic_compare_excha
+@@ -206,10 +202,14 @@ static inline int __atomic_compare_excha
  #define       atomic_dec(env, p)      (--(p)->value)
  #define       atomic_compare_exchange(env, p, oldval, newval)         \
        (DB_ASSERT(env, atomic_read(p) == (oldval)),            \
@@ -56,3 +59,10 @@ Avoid overlap with stdatomic.h, the C++ 
  #else
  #define atomic_inc(env, p)    __atomic_inc(env, p)
  #define atomic_dec(env, p)    __atomic_dec(env, p)
++int atomic_compare_exchange(ENV *env,
++                            db_atomic_t *v,
++                            atomic_value_t oldval,
++                          atomic_value_t newval);
+ #endif
+ #endif
+