Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F154266275
D25529.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
3 KB
Referenced Files
None
Subscribers
None
D25529.id.diff
View Options
Index: head/emulators/qemu-cheri/Makefile
===================================================================
--- head/emulators/qemu-cheri/Makefile
+++ head/emulators/qemu-cheri/Makefile
@@ -26,11 +26,12 @@
qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb \
HAS_CONFIGURE= yes
-USES= compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
- python:build xorg
+USES= compiler:c11 gettext-runtime gl gmake gnome iconv:wchar_t perl5 \
+ pkgconfig python:build xorg
USE_XORG= pixman
USE_GNOME+= glib20 libxml2
-USE_GL+= gbm
+USE_PERL5= build
+USE_GL+= gl
ONLY_FOR_ARCHS= amd64 powerpc64
OPTIONS_DEFINE= DOCS
@@ -55,8 +56,6 @@
--localstatedir=/var
EXTRA_CFLAGS= -DCHERI_UNALIGNED
-QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX}
-PLIST= /dev/null
PLIST_FILES= bin/qemu-system-cheri128 \
bin/qemu-system-cheri128magic \
bin/qemu-system-riscv64cheri
Index: head/emulators/qemu-cheri/pkg-plist
===================================================================
--- head/emulators/qemu-cheri/pkg-plist
+++ head/emulators/qemu-cheri/pkg-plist
@@ -1,92 +0,0 @@
-bin/qemu-ga
-bin/qemu-img
-bin/qemu-io
-bin/qemu-nbd
-bin/qemu-system-cheri
-%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
-%%PORTDOCS%%%%DOCSDIR%%/qmp-commands.txt
-share/man/man1/qemu-img.1.gz
-share/man/man1/qemu.1.gz
-share/man/man8/qemu-nbd.8.gz
-%%DATADIR%%/QEMU,cgthree.bin
-%%DATADIR%%/QEMU,tcx.bin
-%%DATADIR%%/acpi-dsdt.aml
-%%DATADIR%%/bamboo.dtb
-%%DATADIR%%/bios-256k.bin
-%%DATADIR%%/bios.bin
-%%DATADIR%%/efi-e1000.rom
-%%DATADIR%%/efi-eepro100.rom
-%%DATADIR%%/efi-ne2k_pci.rom
-%%DATADIR%%/efi-pcnet.rom
-%%DATADIR%%/efi-rtl8139.rom
-%%DATADIR%%/efi-virtio.rom
-%%DATADIR%%/keymaps/ar
-%%DATADIR%%/keymaps/bepo
-%%DATADIR%%/keymaps/common
-%%DATADIR%%/keymaps/cz
-%%DATADIR%%/keymaps/da
-%%DATADIR%%/keymaps/de
-%%DATADIR%%/keymaps/de-ch
-%%DATADIR%%/keymaps/en-gb
-%%DATADIR%%/keymaps/en-us
-%%DATADIR%%/keymaps/es
-%%DATADIR%%/keymaps/et
-%%DATADIR%%/keymaps/fi
-%%DATADIR%%/keymaps/fo
-%%DATADIR%%/keymaps/fr
-%%DATADIR%%/keymaps/fr-be
-%%DATADIR%%/keymaps/fr-ca
-%%DATADIR%%/keymaps/fr-ch
-%%DATADIR%%/keymaps/hr
-%%DATADIR%%/keymaps/hu
-%%DATADIR%%/keymaps/is
-%%DATADIR%%/keymaps/it
-%%DATADIR%%/keymaps/ja
-%%DATADIR%%/keymaps/lt
-%%DATADIR%%/keymaps/lv
-%%DATADIR%%/keymaps/mk
-%%DATADIR%%/keymaps/modifiers
-%%DATADIR%%/keymaps/nl
-%%DATADIR%%/keymaps/nl-be
-%%DATADIR%%/keymaps/no
-%%DATADIR%%/keymaps/pl
-%%DATADIR%%/keymaps/pt
-%%DATADIR%%/keymaps/pt-br
-%%DATADIR%%/keymaps/ru
-%%DATADIR%%/keymaps/sl
-%%DATADIR%%/keymaps/sv
-%%DATADIR%%/keymaps/th
-%%DATADIR%%/keymaps/tr
-%%DATADIR%%/kvmvapic.bin
-%%DATADIR%%/linuxboot.bin
-%%DATADIR%%/multiboot.bin
-%%DATADIR%%/openbios-ppc
-%%DATADIR%%/openbios-sparc32
-%%DATADIR%%/openbios-sparc64
-%%DATADIR%%/palcode-clipper
-%%DATADIR%%/petalogix-ml605.dtb
-%%DATADIR%%/petalogix-s3adsp1800.dtb
-%%DATADIR%%/ppc_rom.bin
-%%DATADIR%%/pxe-e1000.rom
-%%DATADIR%%/pxe-eepro100.rom
-%%DATADIR%%/pxe-ne2k_pci.rom
-%%DATADIR%%/pxe-pcnet.rom
-%%DATADIR%%/pxe-rtl8139.rom
-%%DATADIR%%/pxe-virtio.rom
-%%DATADIR%%/q35-acpi-dsdt.aml
-%%DATADIR%%/qemu-icon.bmp
-%%DATADIR%%/qemu_logo_no_text.svg
-%%DATADIR%%/s390-ccw.img
-%%DATADIR%%/s390-zipl.rom
-%%DATADIR%%/sgabios.bin
-%%DATADIR%%/slof.bin
-%%DATADIR%%/spapr-rtas.bin
-%%DATADIR%%/trace-events
-%%DATADIR%%/u-boot.e500
-%%DATADIR%%/vgabios-cirrus.bin
-%%DATADIR%%/vgabios-qxl.bin
-%%DATADIR%%/vgabios-stdvga.bin
-%%DATADIR%%/vgabios-virtio.bin
-%%DATADIR%%/vgabios-vmware.bin
-%%DATADIR%%/vgabios.bin
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Apr 28, 12:00 PM (5 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32275707
Default Alt Text
D25529.id.diff (3 KB)
Attached To
Mode
D25529: Cleanup a few things in emulators/qemu-cheri. No functional change.
Attached
Detach File
Event Timeline
Log In to Comment