pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases
Module Name: pkgsrc
Committed By: hauke
Date: Tue Dec 16 10:19:11 UTC 2025
Modified Files:
pkgsrc/databases/db4: distinfo
pkgsrc/databases/db4/patches: patch-ab patch-ae
pkgsrc/databases/db5: distinfo
pkgsrc/databases/db5/patches: patch-ab patch-src_dbinc_mutex_int.h
Log Message:
databases/db[45] -- Add mutex support for SPARC v[78] machines.
Thanks go to John D. Baker for submitting an updated patch to the PR,
and to Andrew Randrianasulu for bringing up the issue again and then
testing the patches.
Fixes PR pkg/43444.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/databases/db4/distinfo
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/db4/patches/patch-ab
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/db4/patches/patch-ae
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/db5/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/db5/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/databases/db5/patches/patch-src_dbinc_mutex_int.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.51 pkgsrc/databases/db4/distinfo:1.52
--- pkgsrc/databases/db4/distinfo:1.51 Mon Oct 20 23:31:37 2025
+++ pkgsrc/databases/db4/distinfo Tue Dec 16 10:19:11 2025
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.51 2025/10/20 23:31:37 mrg Exp $
+$NetBSD: distinfo,v 1.52 2025/12/16 10:19:11 hauke Exp $
BLAKE2s (db-4.8.30.tar.gz) = 0f2f1b2e53dbabd4c34a4df9dbf91f9051a24375bbbfb75c56372bb3af1ca979
SHA512 (db-4.8.30.tar.gz) = d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
Size (db-4.8.30.tar.gz) = 22887305 bytes
SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a
-SHA1 (patch-ab) = 542ea62e3326a4d52fcf6c7afdbf7132d5880c00
+SHA1 (patch-ab) = 6a33d43efbfe34e93954e543fe8c8a72e522b4b4
SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf
-SHA1 (patch-ae) = e47582c71470386a5226408e4d1db31adccadc29
+SHA1 (patch-ae) = c71cd08bc2719491cf1b8cec11aa5534e61dd4f4
SHA1 (patch-af) = d9706895e538468f3b442fde3e8d6c9caceaaf4f
SHA1 (patch-db__sql_sqlite_sqliteInt.h) = 7e5579d6c55c8163e35718bdecbce079b1efde3e
SHA1 (patch-dbinc_atomic.h) = 3397a98c00655a44b7ad09fea78053785b1a42d8
Index: pkgsrc/databases/db4/patches/patch-ab
diff -u pkgsrc/databases/db4/patches/patch-ab:1.27 pkgsrc/databases/db4/patches/patch-ab:1.28
--- pkgsrc/databases/db4/patches/patch-ab:1.27 Tue Jun 18 12:49:22 2024
+++ pkgsrc/databases/db4/patches/patch-ab Tue Dec 16 10:19:11 2025
@@ -1,10 +1,12 @@
-$NetBSD: patch-ab,v 1.27 2024/06/18 12:49:22 markd Exp $
+$NetBSD: patch-ab,v 1.28 2025/12/16 10:19:11 hauke Exp $
Port the configure script to C99. Add missing header files, avoid
calling the undeclared exit function, and add missing return types
main. This improves compatibility with compilers which do not accept
language features that were removed from C99.
+Add mutex implementation for sparc v[789].
+
--- dist/configure.orig 2010-04-12 20:25:23.000000000 +0000
+++ dist/configure
@@ -4523,11 +4523,12 @@ bsdi3*) CC=${CC-"shlicc2"}
@@ -296,16 +298,21 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19216,7 +19269,7 @@ main ()
+@@ -19215,8 +19268,12 @@ main ()
+ {
#if defined(__sparc__) && defined(__GNUC__)
++ #if defined(__sparc_v9__)
asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore");
- exit(0);
++ #else
++ asm volatile ("stbar");
++ #endif
+ return 0;
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19287,7 +19340,7 @@ main ()
+@@ -19287,7 +19344,7 @@ main ()
msem_init(&x, 0);
msem_lock(&x, 0);
msem_unlock(&x, 0);
@@ -314,7 +321,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19319,7 +19372,7 @@ main ()
+@@ -19319,7 +19376,7 @@ main ()
msem_init(&x, 0);
msem_lock(&x, 0);
msem_unlock(&x, 0);
@@ -323,7 +330,7 @@ language features that were removed from
;
return 0;
-@@ -19371,7 +19424,7 @@ main ()
+@@ -19371,7 +19428,7 @@ main ()
{
#if defined(__USLC__)
@@ -332,7 +339,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19502,7 +19555,7 @@ main ()
+@@ -19502,7 +19559,7 @@ main ()
{
#if defined(__alpha) && defined(__DECC)
@@ -341,7 +348,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19527,7 +19580,7 @@ main ()
+@@ -19527,7 +19584,7 @@ main ()
{
#if defined(__alpha) && defined(__GNUC__)
@@ -350,7 +357,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19552,7 +19605,7 @@ main ()
+@@ -19552,7 +19609,7 @@ main ()
{
#if defined(__arm__) && defined(__GNUC__)
@@ -359,7 +366,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19567,6 +19620,31 @@ fi
+@@ -19567,6 +19624,31 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -391,7 +398,7 @@ language features that were removed from
# MIPS/gcc: Linux
if test "$db_cv_mutex" = no; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -19577,7 +19655,7 @@ main ()
+@@ -19577,7 +19659,7 @@ main ()
{
#if (defined(__mips) || defined(__mips__)) && defined(__GNUC__)
@@ -400,7 +407,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19602,7 +19680,7 @@ main ()
+@@ -19602,7 +19684,7 @@ main ()
{
#if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__)
@@ -409,7 +416,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19627,7 +19705,7 @@ main ()
+@@ -19627,7 +19709,7 @@ main ()
{
#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__)
@@ -418,7 +425,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19652,7 +19730,7 @@ main ()
+@@ -19652,7 +19734,7 @@ main ()
{
#if (defined(mc68020) || defined(sun3)) && defined(__GNUC__)
@@ -427,7 +434,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19677,7 +19755,7 @@ main ()
+@@ -19677,7 +19759,7 @@ main ()
{
#if defined(__MVS__) && defined(__IBMC__)
@@ -436,7 +443,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19702,7 +19780,7 @@ main ()
+@@ -19702,7 +19784,7 @@ main ()
{
#if defined(__s390__) && defined(__GNUC__)
@@ -445,7 +452,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19727,7 +19805,7 @@ main ()
+@@ -19727,7 +19809,7 @@ main ()
{
#if defined(__ia64) && defined(__GNUC__)
@@ -454,7 +461,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19752,7 +19830,7 @@ main ()
+@@ -19752,7 +19834,7 @@ main ()
{
#if defined(_UTS)
@@ -463,7 +470,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -19862,6 +19940,10 @@ ARM/gcc-assembly) ADDITIONAL_OBJS="mut_t
+@@ -19862,6 +19944,10 @@ ARM/gcc-assembly) ADDITIONAL_OBJS="mut_t
$as_echo "#define HAVE_MUTEX_ARM_GCC_ASSEMBLY 1" >>confdefs.h
;;
@@ -474,7 +481,7 @@ language features that were removed from
HP/msem_init) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
$as_echo "#define HAVE_MUTEX_HPPA_MSEM_INIT 1" >>confdefs.h
-@@ -20203,9 +20285,9 @@ main ()
+@@ -20203,9 +20289,9 @@ main ()
{
#if ((defined(i386) || defined(__i386__)) && defined(__GNUC__))
@@ -486,7 +493,7 @@ language features that were removed from
#else
FAIL TO COMPILE/LINK
#endif
-@@ -20720,6 +20802,7 @@ if test "$cross_compiling" = yes; then :
+@@ -20720,6 +20806,7 @@ if test "$cross_compiling" = yes; then :
/* end confdefs.h. */
#include <sys/time.h>
@@ -494,7 +501,7 @@ language features that were removed from
int
main ()
{
-@@ -20743,7 +20826,8 @@ else
+@@ -20743,7 +20830,8 @@ else
/* end confdefs.h. */
#include <sys/time.h>
@@ -504,7 +511,7 @@ language features that were removed from
struct timespec t;
return (clock_gettime(CLOCK_MONOTONIC, &t) != 0);
}
-@@ -21600,6 +21684,8 @@ $as_echo_n "checking for 64-bit integral
+@@ -21600,6 +21688,8 @@ $as_echo_n "checking for 64-bit integral
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -513,7 +520,7 @@ language features that were removed from
int
main ()
{
-@@ -21634,7 +21720,9 @@ else
+@@ -21634,7 +21724,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Index: pkgsrc/databases/db4/patches/patch-ae
diff -u pkgsrc/databases/db4/patches/patch-ae:1.2 pkgsrc/databases/db4/patches/patch-ae:1.3
--- pkgsrc/databases/db4/patches/patch-ae:1.2 Thu Feb 14 14:36:06 2019
+++ pkgsrc/databases/db4/patches/patch-ae Tue Dec 16 10:19:11 2025
@@ -1,66 +1,34 @@
-$NetBSD: patch-ae,v 1.2 2019/02/14 14:36:06 thorpej Exp $
+$NetBSD: patch-ae,v 1.3 2025/12/16 10:19:11 hauke Exp $
* adds support for mutexes on aarch64
* fixes build failure on MIPS arch with -mips1.
+* adds mutex support for sparc v[789]
---- dbinc/mutex_int.h.orig 2010-04-12 20:25:22.000000000 +0000
+--- dbinc/mutex_int.h.orig 2025-12-15 13:35:56.838500475 +0000
+++ dbinc/mutex_int.h
-@@ -491,6 +491,43 @@ typedef unsigned char tsl_t;
- #endif
+@@ -751,14 +751,24 @@ typedef unsigned char tsl_t;
+ !__r; \
+ })
- /*********************************************************************
-+ * AARCH64/gcc assembly.
-+ *********************************************************************/
-+
-+#ifdef HAVE_MUTEX_AARCH64_GCC_ASSEMBLY
-+typedef unsigned int tsl_t;
-+
-+#ifdef LOAD_ACTUAL_MUTEX_CODE
-+static inline int
-+MUTEX_SET(tsl_t *tsl) {
-+ register tsl_t *__l = tsl;
-+ register tsl_t __r;
-+ __asm__ volatile(
-+ "1: ldxr %w0,[%1]\n"
-+ " cbnz %w0,2f\n"
-+ " stxr %w0,%w2,[%1]\n"
-+ " cbnz %w0,1b\n"
-+ " dmb st\n"
-+ "2:"
-+ : "=&r"(__r)
-+ : "r"(__l), "r"(1)
-+ : "memory");
-+
-+ return !__r;
-+}
-+
-+static inline int
-+MUTEX_UNSET(tsl_t *tsl) {
-+ __asm__ volatile(
-+ " dsb sy\n" ::: "memory");
-+ return *tsl = 0;
-+}
-+
-+#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
-+#endif
++#if defined (__sparc_v9__)
+ #define MUTEX_UNSET(tsl) (*(tsl) = 0, MUTEX_MEMBAR(tsl))
+-#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
+ #define MUTEX_MEMBAR(x) \
+ ({ __asm__ volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); })
+ #define MEMBAR_ENTER() \
+ ({ __asm__ volatile ("membar #StoreStore|#StoreLoad"); })
+ #define MEMBAR_EXIT() \
+ ({ __asm__ volatile ("membar #StoreStore|#LoadStore"); })
++#else
++#define MUTEX_UNSET(tsl) ({ \
++ __asm__ volatile ("stbar"); \
++ *(tsl) = 0; })
++#define MUTEX_MEMBAR(x) \
++ ({ __asm__ volatile ("stbar"); })
++#define MEMBAR_ENTER()
++#define MEMBAR_EXIT()
+#endif
-+
-+/*********************************************************************
- * HPPA/gcc assembly.
- *********************************************************************/
- #ifdef HAVE_MUTEX_HPPA_GCC_ASSEMBLY
-@@ -778,10 +815,14 @@ MUTEX_SET(tsl_t *tsl) {
- static inline void
- MUTEX_UNSET(tsl_t *tsl) {
- __asm__ volatile(
-+ " .set push \n"
-+ " .set mips2 \n"
- " .set noreorder \n"
-+ " .set nomacro \n"
- " sync \n"
- " sw $0, %0 \n"
- " .set reorder \n"
-+ " .set pop \n"
- : "=m" (*tsl)
- : "m" (*tsl)
- : "memory");
++#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
+ #endif
+ #endif
+
Index: pkgsrc/databases/db5/distinfo
diff -u pkgsrc/databases/db5/distinfo:1.19 pkgsrc/databases/db5/distinfo:1.20
--- pkgsrc/databases/db5/distinfo:1.19 Fri Nov 29 12:18:18 2024
+++ pkgsrc/databases/db5/distinfo Tue Dec 16 10:19:11 2025
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.19 2024/11/29 12:18:18 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2025/12/16 10:19:11 hauke Exp $
BLAKE2s (db-5.3.28.tar.gz) = d2dd2dce59f4383a84dd201d8de5a47a60f56b28cef720186fc9447bc9890de3
SHA512 (db-5.3.28.tar.gz) = e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
Size (db-5.3.28.tar.gz) = 35090431 bytes
SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
-SHA1 (patch-ab) = 0bf2bb3270b6fa334f0d4b93e4a28c44e254b935
+SHA1 (patch-ab) = 3f1dce219ef40f5d91a436d42aad79cf13ea269c
SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0
SHA1 (patch-dist_config.bin) = e58a4637c079a8e2e7334100b9096dba5f0d6600
SHA1 (patch-dist_validate_s__chk__message__id) = 8d410ecdf13def4af99f6c123a4bd5d2a79b2085
SHA1 (patch-src_dbinc_atomic.h) = c4fbe421d2c8ba68dc81aeeda1cad09a2c68fbe5
SHA1 (patch-src_dbinc_db.in) = d20a8c474485811b2e28d54fa5cf2d340d417992
-SHA1 (patch-src_dbinc_mutex_int.h) = 36f7fd31f5f79fe2c121e8f835c342ec24bda89b
+SHA1 (patch-src_dbinc_mutex_int.h) = b8187e7f1db1b09062c90411dd91ecb1c7d1eff0
SHA1 (patch-src_mp_mp__fget.c) = c5050193279db979d51d47f5e2c8d7c5cace0fa7
SHA1 (patch-src_mp_mp__mvcc.c) = 2e8b4e5ff7a7534681597261ba82ca08e9231567
SHA1 (patch-src_mp_mp__region.c) = 1c33dc783660515ff24ba018d1ef99cedf9eb3f8
Index: pkgsrc/databases/db5/patches/patch-ab
diff -u pkgsrc/databases/db5/patches/patch-ab:1.8 pkgsrc/databases/db5/patches/patch-ab:1.9
--- pkgsrc/databases/db5/patches/patch-ab:1.8 Tue Feb 19 15:18:19 2019
+++ pkgsrc/databases/db5/patches/patch-ab Tue Dec 16 10:19:11 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2019/02/19 15:18:19 hauke Exp $
+$NetBSD: patch-ab,v 1.9 2025/12/16 10:19:11 hauke Exp $
Fix bashisms.
@@ -6,6 +6,8 @@ FreeBSD 10 is not FreeBSD 1.
Add support for mutexes on aarch64 with GCC.
+Add support for mutexes on sparc v[789].
+
--- dist/configure.orig 2013-09-09 15:35:02.000000000 +0000
+++ dist/configure
@@ -5112,7 +5112,7 @@ bsdi3*) CC=${CC-"shlicc2"}
@@ -107,7 +109,19 @@ Add support for mutexes on aarch64 with
LIBS="$LIBS -lpthread"
if test "$cross_compiling" = yes; then :
-@@ -21796,6 +21796,31 @@ fi
+@@ -21444,7 +21444,11 @@ main ()
+ {
+
+ #if defined(__sparc__) && defined(__GNUC__)
++ #if defined(__sparc_v9__)
+ asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore");
++ #else
++ asm volatile ("stbar");
++ #endif
+ exit(0);
+ #else
+ FAIL TO COMPILE/LINK
+@@ -21796,6 +21800,31 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -139,7 +153,7 @@ Add support for mutexes on aarch64 with
# MIPS/gcc: Linux
if test "$db_cv_mutex" = no; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22124,6 +22149,10 @@ ARM/gcc-assembly) ADDITIONAL_OBJS="mut_t
+@@ -22124,6 +22153,10 @@ ARM/gcc-assembly) ADDITIONAL_OBJS="mut_t
$as_echo "#define HAVE_MUTEX_ARM_GCC_ASSEMBLY 1" >>confdefs.h
;;
Index: pkgsrc/databases/db5/patches/patch-src_dbinc_mutex_int.h
diff -u pkgsrc/databases/db5/patches/patch-src_dbinc_mutex_int.h:1.1 pkgsrc/databases/db5/patches/patch-src_dbinc_mutex_int.h:1.2
--- pkgsrc/databases/db5/patches/patch-src_dbinc_mutex_int.h:1.1 Tue Feb 19 15:18:19 2019
+++ pkgsrc/databases/db5/patches/patch-src_dbinc_mutex_int.h Tue Dec 16 10:19:11 2025
@@ -1,9 +1,10 @@
-$NetBSD: patch-src_dbinc_mutex_int.h,v 1.1 2019/02/19 15:18:19 hauke Exp $
+$NetBSD: patch-src_dbinc_mutex_int.h,v 1.2 2025/12/16 10:19:11 hauke Exp $
* adds support for mutexes on aarch64
+* adds support for mutexes on sparc v[789]
* fixes build failure on MIPS arch with -mips1.
---- src/dbinc/mutex_int.h.orig 2010-04-12 20:25:22.000000000 +0000
+--- src/dbinc/mutex_int.h.orig 2013-09-09 15:35:08.000000000 +0000
+++ src/dbinc/mutex_int.h
@@ -491,6 +491,43 @@ typedef unsigned char tsl_t;
#endif
@@ -49,7 +50,33 @@ $NetBSD: patch-src_dbinc_mutex_int.h,v 1
* HPPA/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_HPPA_GCC_ASSEMBLY
-@@ -778,10 +815,14 @@ MUTEX_SET(tsl_t *tsl) {
+@@ -714,14 +751,24 @@ typedef unsigned char tsl_t;
+ !__r; \
+ })
+
++#if defined (__sparc_v9__)
+ #define MUTEX_UNSET(tsl) (*(tsl) = 0, MUTEX_MEMBAR(tsl))
+-#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
+ #define MUTEX_MEMBAR(x) \
+ ({ __asm__ volatile ("membar #StoreStore|#StoreLoad|#LoadStore"); })
+ #define MEMBAR_ENTER() \
+ ({ __asm__ volatile ("membar #StoreStore|#StoreLoad"); })
+ #define MEMBAR_EXIT() \
+ ({ __asm__ volatile ("membar #StoreStore|#LoadStore"); })
++#else
++#define MUTEX_UNSET(tsl) ({ \
++ __asm__ volatile ("stbar"); \
++ *(tsl) = 0; })
++#define MUTEX_MEMBAR(x) \
++ ({ __asm__ volatile ("stbar"); })
++#define MEMBAR_ENTER()
++#define MEMBAR_EXIT()
++#endif
++#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
+ #endif
+ #endif
+
+@@ -778,10 +825,14 @@ MUTEX_SET(tsl_t *tsl) {
static inline void
MUTEX_UNSET(tsl_t *tsl) {
__asm__ volatile(
Home |
Main Index |
Thread Index |
Old Index