diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/db6/Makefile | 8 | ||||
| -rw-r--r-- | databases/db6/files/patch-src_dbinc_mutex__int.h | 23 |
2 files changed, 24 insertions, 7 deletions
diff --git a/databases/db6/Makefile b/databases/db6/Makefile index 24f3a8273180..6b796871c864 100644 --- a/databases/db6/Makefile +++ b/databases/db6/Makefile @@ -3,7 +3,7 @@ PORTNAME= db6 PORTVERSION= 6.2.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= @@ -64,12 +64,6 @@ DOCS_INSTALL_TARGET= install_docs .include <bsd.port.options.mk> -.if ${ARCH:Marm*} && empty(ARCH:Marmv6*) -# db6 uses LDREX/STREX instructions for mutexes on ARM, -# which are unavailable before ARMv6. -CONFIGURE_ARGS+= --enable-posixmutexes -.endif - post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \ diff --git a/databases/db6/files/patch-src_dbinc_mutex__int.h b/databases/db6/files/patch-src_dbinc_mutex__int.h index 750f9c3504a4..7f85db3b67eb 100644 --- a/databases/db6/files/patch-src_dbinc_mutex__int.h +++ b/databases/db6/files/patch-src_dbinc_mutex__int.h @@ -1,5 +1,28 @@ --- src/dbinc/mutex_int.h.orig 2016-03-28 19:45:54 UTC +++ src/dbinc/mutex_int.h +@@ -9,6 +9,7 @@ + #ifndef _DB_MUTEX_INT_H_ + #define _DB_MUTEX_INT_H_ + ++#include <machine/atomic.h> + #include "dbinc/atomic.h" + + #if defined(__cplusplus) +@@ -506,11 +507,11 @@ typedef unsigned int tsl_t; + #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0) + #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0) + #define MUTEX_MEMBAR(x) \ +- ({ __asm__ volatile ("dsb"); }) ++ dsb(x) + #define MEMBAR_ENTER() \ +- ({ __asm__ volatile ("dsb"); }) ++ dsb() + #define MEMBAR_EXIT() \ +- ({ __asm__ volatile ("dsb"); }) ++ dsb() + #endif + #endif + @@ -652,7 +652,7 @@ MUTEX_SET(int *tsl) { : "=&r" (__r), "+r" (tsl) : |