svn commit: r404223 - in branches/2015Q4/databases: db48 db5 db6

[Matthias Andree]

Author: mandree
Date: Tue Dec 22 08:46:33 2015
New Revision: 404223
URL: https://svnweb.freebsd.org/changeset/ports/404223

Log:
  MFH: r401088 r404013
  
  As with armv6 we need to use POSIX mutexes. Without this the ports try to
  use fcntl mutexes and fails as they are deprecated.
  
  Approved by:	mandree (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D4107
  
  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
  Approved by:	ports-secteam (feld@)

Modified:
  branches/2015Q4/databases/db48/Makefile
  branches/2015Q4/databases/db5/Makefile
  branches/2015Q4/databases/db6/Makefile
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/databases/db48/Makefile
==============================================================================
--- branches/2015Q4/databases/db48/Makefile	Tue Dec 22 08:31:52 2015	(r404222)
+++ branches/2015Q4/databases/db48/Makefile	Tue Dec 22 08:46:33 2015	(r404223)
@@ -35,7 +35,7 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == "aarch64" || ${ARCH} == "armv6"
 # db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .endif

Modified: branches/2015Q4/databases/db5/Makefile
==============================================================================
--- branches/2015Q4/databases/db5/Makefile	Tue Dec 22 08:31:52 2015	(r404222)
+++ branches/2015Q4/databases/db5/Makefile	Tue Dec 22 08:46:33 2015	(r404223)
@@ -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} == "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: branches/2015Q4/databases/db6/Makefile
==============================================================================
--- branches/2015Q4/databases/db6/Makefile	Tue Dec 22 08:31:52 2015	(r404222)
+++ branches/2015Q4/databases/db6/Makefile	Tue Dec 22 08:46:33 2015	(r404223)
@@ -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} == "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