From owner-svn-ports-head@freebsd.org Mon Feb 22 19:41:01 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B912CAB0EF7; Mon, 22 Feb 2016 19:41:01 +0000 (UTC) (envelope-from brooks@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 mx1.freebsd.org (Postfix) with ESMTPS id 928B9132D; Mon, 22 Feb 2016 19:41:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1MJf0i0076578; Mon, 22 Feb 2016 19:41:00 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1MJf08A076573; Mon, 22 Feb 2016 19:41:00 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201602221941.u1MJf08A076573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 22 Feb 2016 19:41:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409365 - in head/emulators: . qemu-cheri qemu-cheri128 X-SVN-Group: ports-head 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2016 19:41:01 -0000 Author: brooks Date: Mon Feb 22 19:40:59 2016 New Revision: 409365 URL: https://svnweb.freebsd.org/changeset/ports/409365 Log: Update qemu-cheri to a fresh snapshot and add a port to build the 128-bit version. Added: head/emulators/qemu-cheri128/ head/emulators/qemu-cheri128/Makefile (contents, props changed) Modified: head/emulators/Makefile head/emulators/qemu-cheri/Makefile head/emulators/qemu-cheri/Makefile.snapshot head/emulators/qemu-cheri/distinfo Modified: head/emulators/Makefile ============================================================================== --- head/emulators/Makefile Mon Feb 22 19:20:02 2016 (r409364) +++ head/emulators/Makefile Mon Feb 22 19:40:59 2016 (r409365) @@ -117,6 +117,7 @@ SUBDIR += q4wine SUBDIR += qemu SUBDIR += qemu-cheri + SUBDIR += qemu-cheri128 SUBDIR += qemu-devel SUBDIR += qemu-launcher SUBDIR += qemu-sbruno Modified: head/emulators/qemu-cheri/Makefile ============================================================================== --- head/emulators/qemu-cheri/Makefile Mon Feb 22 19:20:02 2016 (r409364) +++ head/emulators/qemu-cheri/Makefile Mon Feb 22 19:40:59 2016 (r409365) @@ -3,10 +3,10 @@ PORTNAME= qemu PORTVERSION= 0.d${SNAPDATE} CATEGORIES= emulators devel -PKGNAMESUFFIX= -cheri +PKGNAMESUFFIX?= -cheri MAINTAINER= brooks@FreeBSD.org -COMMENT= QEMU emulator with CHERI CPU support +COMMENT?= QEMU emulator with CHERI CPU support USE_GITHUB= yes GH_ACCOUNT= CTSRD-CHERI @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= \ --disable-smartcard-nss \ --disable-vte \ --disable-xen \ - --extra-cflags=-g \ + --extra-cflags="-g ${EXTRA_CFLAGS}" \ --localstatedir=/var .include Modified: head/emulators/qemu-cheri/Makefile.snapshot ============================================================================== --- head/emulators/qemu-cheri/Makefile.snapshot Mon Feb 22 19:20:02 2016 (r409364) +++ head/emulators/qemu-cheri/Makefile.snapshot Mon Feb 22 19:40:59 2016 (r409365) @@ -4,6 +4,6 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20160128 +SNAPDATE= 20160220 -QEMU_COMMIT= 100abeddda5764c193807863806df7027471db94 +QEMU_COMMIT= 5f5668398f6eba799298072ac761e7216e360d85 Modified: head/emulators/qemu-cheri/distinfo ============================================================================== --- head/emulators/qemu-cheri/distinfo Mon Feb 22 19:20:02 2016 (r409364) +++ head/emulators/qemu-cheri/distinfo Mon Feb 22 19:40:59 2016 (r409365) @@ -1,2 +1,2 @@ -SHA256 (CTSRD-CHERI-qemu-0.d20160128-100abeddda5764c193807863806df7027471db94_GH0.tar.gz) = cbe4c5508c8b3ab2ecf52e1d1e80580fdfe610ec15d7b4413c5531563f71d349 -SIZE (CTSRD-CHERI-qemu-0.d20160128-100abeddda5764c193807863806df7027471db94_GH0.tar.gz) = 11137465 +SHA256 (CTSRD-CHERI-qemu-0.d20160220-5f5668398f6eba799298072ac761e7216e360d85_GH0.tar.gz) = 9a43a26c7144ac7995e33e956390b96695a8d5cae5327dbb06c9ca0b32289437 +SIZE (CTSRD-CHERI-qemu-0.d20160220-5f5668398f6eba799298072ac761e7216e360d85_GH0.tar.gz) = 11139308 Added: head/emulators/qemu-cheri128/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-cheri128/Makefile Mon Feb 22 19:40:59 2016 (r409365) @@ -0,0 +1,20 @@ +# Created by: Brooks Davis +# $FreeBSD$ + +PKGNAMESUFFIX= -cheri128 + +COMMENT= QEMU emulator with CHERI CPU support (128-bit) + +RUN_DEPENDS= qemu-system-cheri:${PORTSDIR}/emulators/qemu-cheri + +MASTERDIR= ${.CURDIR}/../qemu-cheri + +EXTRA_CFLAGS= -DCHERI_MAGIC128 +PLIST= /dev/null +PLIST_FILES= bin/qemu-system-cheri128 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \ + ${STAGEDIR}${PREFIX}/bin/qemu-system-cheri128 + +.include <${MASTERDIR}/Makefile>