svn commit: r437229 - in head/emulators: qemu-cheri qemu-cheri128 qemu-cheri128m

[Brooks Davis]

Author: brooks
Date: Wed Mar 29 20:10:08 2017
New Revision: 437229
URL: https://svnweb.freebsd.org/changeset/ports/437229

Log:
  Update to a fresh snapshot.
  
  Rework to depend on emulators/qemu for any ancillary files rather than
  installing a conflicting set.[0]
  
  Disable more automatically detected bits so dependencies are correct
  when built manually.
  
  Requested by:	jhb[0]
  Sponsored by:	DARPA, AFRL

Modified:
  head/emulators/qemu-cheri/Makefile
  head/emulators/qemu-cheri/Makefile.snapshot
  head/emulators/qemu-cheri/distinfo
  head/emulators/qemu-cheri128/Makefile
  head/emulators/qemu-cheri128m/Makefile

Modified: head/emulators/qemu-cheri/Makefile
==============================================================================
--- head/emulators/qemu-cheri/Makefile	Wed Mar 29 20:05:09 2017	(r437228)
+++ head/emulators/qemu-cheri/Makefile	Wed Mar 29 20:10:08 2017	(r437229)
@@ -8,31 +8,48 @@ PKGNAMESUFFIX?=	-cheri
 MAINTAINER=	brooks at FreeBSD.org
 COMMENT?=	QEMU emulator with CHERI CPU support
 
+# XXX: disabling gnutls doesn't work so depend on it to avoid breakage.
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libnettle.so:security/nettle
+RUN_DEPENDS=	qemu-system-i386:emulators/qemu
+
+LICENSE=	GPLv2
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	${QEMU_COMMIT}
 
 HAS_CONFIGURE=	yes
-USES=	gmake libtool makeinfo pkgconfig python:2,build
+USES=	gettext-runtime gmake libtool makeinfo pkgconfig python:2,build
 USE_XORG=	pixman
 USE_GNOME+=	glib20
 #MAKE_ENV+=	BSD_MAKE="${MAKE}"
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64
 
-CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-[0-9]* qemu-sbruno-[0-9]*
-
 .include "Makefile.snapshot"
 
 CONFIGURE_ARGS+= \
 		--target-list=cheri-softmmu \
+		--disable-curl \
 		--disable-gtk \
+		--disable-libssh2 \
 		--disable-linux-user \
 		--disable-linux-aio \
 		--disable-kvm \
+		--disable-vnc-png \
+		--disable-sdl \
 		--disable-smartcard-nss \
 		--disable-vte \
 		--disable-xen \
 		--extra-cflags="-g ${EXTRA_CFLAGS}" \
 		--localstatedir=/var
 
+QEMU_SYSTEM_CHERI?=	qemu-system${PKGNAMESUFFIX}
+PLIST=	/dev/null
+PLIST_FILES=	bin/${QEMU_SYSTEM_CHERI}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \
+	    ${STAGEDIR}${PREFIX}/bin/${QEMU_SYSTEM_CHERI}
+
 .include <bsd.port.mk>

Modified: head/emulators/qemu-cheri/Makefile.snapshot
==============================================================================
--- head/emulators/qemu-cheri/Makefile.snapshot	Wed Mar 29 20:05:09 2017	(r437228)
+++ head/emulators/qemu-cheri/Makefile.snapshot	Wed Mar 29 20:10:08 2017	(r437229)
@@ -4,6 +4,6 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20161129
+SNAPDATE=	20170327
 
-QEMU_COMMIT=		b500fda6dad7d3e61f1d48bae6d6eb531c9d6613
+QEMU_COMMIT=		66d79da43983cba34f3b83ffe4f128c5b430b5b3

Modified: head/emulators/qemu-cheri/distinfo
==============================================================================
--- head/emulators/qemu-cheri/distinfo	Wed Mar 29 20:05:09 2017	(r437228)
+++ head/emulators/qemu-cheri/distinfo	Wed Mar 29 20:10:08 2017	(r437229)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480448915
-SHA256 (CTSRD-CHERI-qemu-0.d20161129-b500fda6dad7d3e61f1d48bae6d6eb531c9d6613_GH0.tar.gz) = 4a849128583e69e6f426a9161f9d042c3eac4c502a63611de7596174878320f3
-SIZE (CTSRD-CHERI-qemu-0.d20161129-b500fda6dad7d3e61f1d48bae6d6eb531c9d6613_GH0.tar.gz) = 11147184
+TIMESTAMP = 1490808893
+SHA256 (CTSRD-CHERI-qemu-0.d20170327-66d79da43983cba34f3b83ffe4f128c5b430b5b3_GH0.tar.gz) = b8f1ba9af8731d596b4af8ca8be66327727c9d0b6df6dba247cb55557a81519e
+SIZE (CTSRD-CHERI-qemu-0.d20170327-66d79da43983cba34f3b83ffe4f128c5b430b5b3_GH0.tar.gz) = 11149374

Modified: head/emulators/qemu-cheri128/Makefile
==============================================================================
--- head/emulators/qemu-cheri128/Makefile	Wed Mar 29 20:05:09 2017	(r437228)
+++ head/emulators/qemu-cheri128/Makefile	Wed Mar 29 20:10:08 2017	(r437229)
@@ -5,16 +5,8 @@ PKGNAMESUFFIX=	-cheri128
 
 COMMENT=	QEMU emulator with CHERI CPU support (128-bit)
 
-RUN_DEPENDS=	qemu-system-cheri:emulators/qemu-cheri
-
 MASTERDIR=	${.CURDIR}/../qemu-cheri
 
 EXTRA_CFLAGS=	-DCHERI_128
-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>

Modified: head/emulators/qemu-cheri128m/Makefile
==============================================================================
--- head/emulators/qemu-cheri128m/Makefile	Wed Mar 29 20:05:09 2017	(r437228)
+++ head/emulators/qemu-cheri128m/Makefile	Wed Mar 29 20:10:08 2017	(r437229)
@@ -5,16 +5,8 @@ PKGNAMESUFFIX=	-cheri128m
 
 COMMENT=	QEMU emulator with CHERI CPU support (128-bit, magic compression)
 
-RUN_DEPENDS=	qemu-system-cheri:emulators/qemu-cheri
-
 MASTERDIR=	${.CURDIR}/../qemu-cheri
 
 EXTRA_CFLAGS=	-DCHERI_MAGIC128
-PLIST=		/dev/null
-PLIST_FILES=	bin/qemu-system-cheri128m
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \
-	    ${STAGEDIR}${PREFIX}/bin/qemu-system-cheri128m
 
 .include <${MASTERDIR}/Makefile>