diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2021-04-20 19:41:51 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2021-04-20 19:46:11 +0000 |
| commit | 9e06cd0454806020fc8e2f11df85baf500690902 (patch) | |
| tree | d58aaffe402af29b07487ce11ad7a8aa68fac76a /emulators | |
| parent | 886923a37e002671ab80c7267e414ca4712aacbd (diff) | |
| download | ports-9e06cd0454806020fc8e2f11df85baf500690902.tar.gz ports-9e06cd0454806020fc8e2f11df85baf500690902.zip | |
emulators/qemu: Fix build on 13
- Use ports dtc instead of packaged dtc [1]
- bin/elf2dmp apparently depends on CURL [2]
- Reduce build to only X86 architectures if X86_TARGETS is set [2]
- rx is not an X86 architecture [2]
PR: 245997 [1] 254385 [2]
Reported by: swills [1] pstef [2]
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/Makefile | 13 | ||||
| -rw-r--r-- | emulators/qemu/pkg-plist | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index a3eddfedcd2b..073ceb348b86 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -2,6 +2,7 @@ PORTNAME= qemu PORTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -19,7 +20,8 @@ LIB_DEPENDS?= libnettle.so:security/nettle \ libfreetype.so:print/freetype2 \ libepoxy.so:graphics/libepoxy \ libpcre2-8.so:devel/pcre2 \ - libzstd.so:archivers/zstd + libzstd.so:archivers/zstd \ + libfdt.so:sysutils/dtc PATCHFILES+= 55765822804f.patch:-p1 PATCHFILES+= aa4d30f6618d.patch:-p1 @@ -112,6 +114,7 @@ X11_USES= sdl X86_TARGETS_USE_OFF= XORG=pixman,x11 X86_TARGETS_USES_OFF= xorg INSTALLS_ICONS= yes +X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user' .endif PORTDOCS?= docs index.html interop/.buildinfo interop/* qemu-ga-ref.html qemu-ga-ref.txt \ @@ -122,7 +125,7 @@ WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CFLAGS_amd64+= -fPIC CONFIGURE_ARGS?=--localstatedir=/var \ - --extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh \ + --extra-ldflags=-L${LOCALBASE}/lib --disable-libssh \ --prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --python=${PYTHON_CMD} \ @@ -150,6 +153,12 @@ MAKE_ARGS+= ARCH=ppc64 CONFIGURE_ARGS+= --sparc_cpu=v9 .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 +PLIST_SUB+= IVSHMEM="" +.else +PLIST_SUB+= IVSHMEM="@comment " +.endif + PLIST_SUB+= LINUXBOOT_DMA="" post-patch-CDROM_DMA-off: diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist index c757443833ac..7d411c15d7b8 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -1,4 +1,6 @@ -bin/elf2dmp +%%CURL%%bin/elf2dmp +%%IVSHMEM%%bin/ivshmem-client +%%IVSHMEM%%bin/ivshmem-server bin/qemu-edid bin/qemu-ga bin/qemu-i386 @@ -30,7 +32,7 @@ bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-ppc64 %%NO_X86_TARGETS%%bin/qemu-system-riscv32 %%NO_X86_TARGETS%%bin/qemu-system-riscv64 -bin/qemu-system-rx +%%NO_X86_TARGETS%%bin/qemu-system-rx %%NO_X86_TARGETS%%bin/qemu-system-s390x %%NO_X86_TARGETS%%bin/qemu-system-sh4 %%NO_X86_TARGETS%%bin/qemu-system-sh4eb |