From owner-svn-ports-head@freebsd.org  Thu Dec 24 06:48:49 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 427B34B9789;
 Thu, 24 Dec 2020 06:48:49 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D1gds1QjQz3HPj;
 Thu, 24 Dec 2020 06:48:49 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23A4D40F8;
 Thu, 24 Dec 2020 06:48:49 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BO6mn3g055029;
 Thu, 24 Dec 2020 06:48:49 GMT (envelope-from linimon@FreeBSD.org)
Received: (from linimon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BO6mn2w055028;
 Thu, 24 Dec 2020 06:48:49 GMT (envelope-from linimon@FreeBSD.org)
Message-Id: <202012240648.0BO6mn2w055028@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: linimon set sender to
 linimon@FreeBSD.org using -f
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 24 Dec 2020 06:48:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r559050 - head/databases/libcouchbase
X-SVN-Group: ports-head
X-SVN-Commit-Author: linimon
X-SVN-Commit-Paths: head/databases/libcouchbase
X-SVN-Commit-Revision: 559050
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Dec 2020 06:48:49 -0000

Author: linimon
Date: Thu Dec 24 06:48:48 2020
New Revision: 559050
URL: https://svnweb.freebsd.org/changeset/ports/559050

Log:
  Use the most recent change from arm to fix build on riscv64.
  
  While here, generalize the arm expression the way we usually do.
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/databases/libcouchbase/Makefile

Modified: head/databases/libcouchbase/Makefile
==============================================================================
--- head/databases/libcouchbase/Makefile	Thu Dec 24 06:01:31 2020	(r559049)
+++ head/databases/libcouchbase/Makefile	Thu Dec 24 06:48:48 2020	(r559050)
@@ -11,7 +11,6 @@ COMMENT=	Multithreaded noSQL database (client and libr
 LICENSE=	APACHE20
 
 BROKEN_mips64=		fails to link: ld: failed to merge target specific data
-BROKEN_riscv64=		fails to build: dt_modtext: libdtrace/common/dt_link.c(947): RISC-V implementation required
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libev.so:devel/libev \
@@ -25,7 +24,7 @@ CMAKE_ARGS=	-DLCB_NO_TESTS=1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == riscv64
 CMAKE_ARGS+=	-DDTRACE:BOOL=FALSE
 .endif