svn commit: r404013 - in head/databases: db5 db6

[Matthias Andree]

Author: mandree
Date: Sat Dec 19 11:03:36 2015
New Revision: 404013
URL: https://svnweb.freebsd.org/changeset/ports/404013

Log:
  Fix crash by using POSIX mutexes on all armv6* ARCHes not just armv6.
  
  This is to fix illegal-instruction crashes on armv6hf.
  
  PR:		205001
  Submitted by:	dave at dogwood.com
  Reviewed by:	mikael.urankar at gmail.com
  MFH:		2015Q4

Modified:
  head/databases/db5/Makefile
  head/databases/db6/Makefile

Modified: head/databases/db5/Makefile
==============================================================================
--- head/databases/db5/Makefile	Sat Dec 19 10:50:13 2015	(r404012)
+++ head/databases/db5/Makefile	Sat Dec 19 11:03:36 2015	(r404013)
@@ -3,7 +3,7 @@
 
 PORTNAME=	db5
 PORTVERSION=	5.3.28
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -39,8 +39,9 @@ SQL_DESC=	Enable SQL API (EXPERIMENTAL)
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "aarch64" || ${ARCH} == "armv6"
+.if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
 # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
+# also bug#205001
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .endif
 

Modified: head/databases/db6/Makefile
==============================================================================
--- head/databases/db6/Makefile	Sat Dec 19 10:50:13 2015	(r404012)
+++ head/databases/db6/Makefile	Sat Dec 19 11:03:36 2015	(r404013)
@@ -3,6 +3,7 @@
 
 PORTNAME=	db6
 PORTVERSION=	6.1.19
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -40,8 +41,9 @@ SQL_DESC=	Enable SQL API (EXPERIMENTAL)
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "aarch64" || ${ARCH} == "armv6"
+.if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
 # db6 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
+# and also bug #205001
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .endif