diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile index 2efdca78d363..5d533c6349ed 100644 --- a/emulators/qemu-cheri/Makefile +++ b/emulators/qemu-cheri/Makefile @@ -1,71 +1,70 @@ PORTNAME= qemu PORTVERSION= 0.d${SNAPDATE} -PORTREVISION= 4 CATEGORIES= emulators devel PKGNAMESUFFIX= -cheri MAINTAINER= brooks@FreeBSD.org COMMENT?= QEMU emulator with CHERI CPU support WWW= https://github.com/CTSRD-CHERI/qemu # XXX: disabling gnutls doesn't work so depend on it to avoid breakage. BUILD_DEPENDS= bash:shells/bash \ meson>=0.57.1_1:devel/meson LIB_DEPENDS= libcapstone.so:devel/capstone3 \ libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libgnutls.so:security/gnutls \ libnettle.so:security/nettle RUN_DEPENDS= qemu-system-i386:emulators/qemu LICENSE= GPLv2 USE_GITHUB= yes GH_TUPLE= CTSRD-CHERI:qemu:${QEMU_COMMIT} \ qemu:dtc:85e5d83:qemu_dtc/dtc \ qemu:libslirp:487f4bf4:qemu_libslirp/slirp \ qemu:berkeley-softfloat-3:b64af41:qemu_berkeley_softfloat_3/tests/fp/berkeley-softfloat-3 \ qemu:berkeley-testfloat-3:ca9fa2b:qemu_berkeley_testfloat_3/tests/fp/berkeley-testfloat-3 \ qemu:keycodemapdb:6b3d716:qemu_keycodemapdb/ui/keycodemapdb \ HAS_CONFIGURE= yes MAKEFILE= GNUmakefile USES= cpe gmake gnome ninja:build perl5 pkgconfig python:build xorg USE_XORG= pixman USE_GNOME+= glib20 libxml2 USE_PERL5= build USE_GL+= gl ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le OPTIONS_DEFINE= DOCS .include "Makefile.snapshot" CONFIGURE_ARGS+= \ --target-list=riscv64cheri-softmmu,morello-softmmu \ --disable-curl \ --disable-git-update \ --disable-gtk \ --disable-linux-user \ --disable-linux-aio \ --disable-kvm \ --disable-opengl \ --disable-vnc-png \ --disable-sdl \ --disable-vte \ --disable-xen \ --meson=${LOCALBASE}/bin/meson \ --smbd=${LOCALBASE}/sbin/smbd \ --extra-cflags="-g ${EXTRA_CFLAGS}" \ --localstatedir=/var EXTRA_CFLAGS= -DCHERI_UNALIGNED PLIST_FILES= bin/qemu-system-morello \ bin/qemu-system-riscv64cheri do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build/qemu-system-morello \ ${WRKSRC}/build/qemu-system-riscv64cheri \ ${STAGEDIR}${PREFIX}/bin/ .include diff --git a/emulators/qemu-cheri/Makefile.snapshot b/emulators/qemu-cheri/Makefile.snapshot index 5e9238ba8343..a2d343fe4d6f 100644 --- a/emulators/qemu-cheri/Makefile.snapshot +++ b/emulators/qemu-cheri/Makefile.snapshot @@ -1,7 +1,7 @@ # Generated file! Do not edit! # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20220301 +SNAPDATE= 20230224 -QEMU_COMMIT= ef6b6871875931eb77aaa36124fa5cee796d4782 +QEMU_COMMIT= 3771e96493a49a5cdfc392592cfe23b42d23d0cf diff --git a/emulators/qemu-cheri/distinfo b/emulators/qemu-cheri/distinfo index 4bd7a7f58063..2d80189badec 100644 --- a/emulators/qemu-cheri/distinfo +++ b/emulators/qemu-cheri/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1650064276 -SHA256 (CTSRD-CHERI-qemu-0.d20220301-ef6b6871875931eb77aaa36124fa5cee796d4782_GH0.tar.gz) = 50736712857b58e6adbf73bd293683daea15e0036acabc3a4e7c496a22216bec -SIZE (CTSRD-CHERI-qemu-0.d20220301-ef6b6871875931eb77aaa36124fa5cee796d4782_GH0.tar.gz) = 31619793 +TIMESTAMP = 1681932572 +SHA256 (CTSRD-CHERI-qemu-0.d20230224-3771e96493a49a5cdfc392592cfe23b42d23d0cf_GH0.tar.gz) = a27a71817b6f6ab411e85e302f443b88020d3d369c67ad3012a33f35e7503dd9 +SIZE (CTSRD-CHERI-qemu-0.d20230224-3771e96493a49a5cdfc392592cfe23b42d23d0cf_GH0.tar.gz) = 31627646 SHA256 (qemu-dtc-85e5d83_GH0.tar.gz) = 3507d8e96d1942493128591b518c522cfd56d7779ce53283b2cf33661b809479 SIZE (qemu-dtc-85e5d83_GH0.tar.gz) = 200566 SHA256 (qemu-libslirp-487f4bf4_GH0.tar.gz) = 92b459875d1113db42a1cb1406f26c191b7c4af4d4ef7eed70eae2b4e55fc1ab SIZE (qemu-libslirp-487f4bf4_GH0.tar.gz) = 131446 SHA256 (qemu-berkeley-softfloat-3-b64af41_GH0.tar.gz) = f22bf52cc980b122c663f2e22f8098fa60d8e468e0095f1da58231235a6b324e SIZE (qemu-berkeley-softfloat-3-b64af41_GH0.tar.gz) = 148768 SHA256 (qemu-berkeley-testfloat-3-ca9fa2b_GH0.tar.gz) = 6df3f2dee4a1b50521d7270c89392fa4ba8ca80f6dbaba92816e03e517269562 SIZE (qemu-berkeley-testfloat-3-ca9fa2b_GH0.tar.gz) = 138959 SHA256 (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9 SIZE (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905