Date: Sun, 26 Apr 2026 18:27:57 +0000 From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f816572e04c2 - main - emulators/qemu: Fix build with 15 and later Message-ID: <69ee592d.21c2e.537f7f5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f816572e04c228b7b091aa3ff8e395d5c1c9ab2b commit f816572e04c228b7b091aa3ff8e395d5c1c9ab2b Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2026-04-26 14:40:05 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2026-04-26 18:27:31 +0000 emulators/qemu: Fix build with 15 and later - Add missing dependency Reported by: otis Event: Wiesbaden Hackathon 202604 --- emulators/qemu/Makefile | 4 ++- emulators/qemu/files/extra-patch-meson.build | 38 ---------------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 72211474c9d8..5145a7c375ca 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,5 +1,6 @@ PORTNAME= qemu DISTVERSION= 11.0.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -16,6 +17,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le .endif BUILD_DEPENDS= bash:shells/bash \ + ${PYTHON_PKGNAMEPREFIX}qemu.qmp>=0.0.5:emulators/py-qemu.qmp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} .if ${FLAVOR:U} != guestagent LIB_DEPENDS+= libzstd.so:archivers/zstd @@ -52,7 +54,7 @@ guestagent_PLIST= ${.CURDIR}/pkg-plist-ga guestagent_CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu-tools qemu-utils qemu6* \ qemu7* qemu-guest-agent -USES= cpe gmake gnome ninja perl5 pkgconfig python:build shebangfix tar:xz +USES= cpe gmake gnome ninja perl5 pkgconfig python shebangfix tar:xz SHEBANG_FILES= scripts/xml-preprocess.py USE_GNOME= glib20 USE_PERL5= build diff --git a/emulators/qemu/files/extra-patch-meson.build b/emulators/qemu/files/extra-patch-meson.build deleted file mode 100644 index 5fc53eb7c6f6..000000000000 --- a/emulators/qemu/files/extra-patch-meson.build +++ /dev/null @@ -1,38 +0,0 @@ ---- meson.build.orig 2025-12-03 21:35:34 UTC -+++ meson.build -@@ -2738,17 +2738,6 @@ have_inotify_init1 = cc.has_header_symbol('sys/inotify - - have_inotify_init = cc.has_header_symbol('sys/inotify.h', 'inotify_init') - have_inotify_init1 = cc.has_header_symbol('sys/inotify.h', 'inotify_init1') --inotify = not_found --if (have_inotify_init or have_inotify_init1) and host_os == 'freebsd' -- # libinotify-kqueue -- inotify = cc.find_library('inotify') -- if have_inotify_init -- have_inotify_init = inotify.found() -- endif -- if have_inotify_init1 -- have_inotify_init1 = inotify.found() -- endif --endif - config_host_data.set('CONFIG_INOTIFY', have_inotify_init) - config_host_data.set('CONFIG_INOTIFY1', have_inotify_init1) - -@@ -5011,7 +5000,6 @@ if host_os == 'freebsd' - summary_info += {'selinux': selinux} - summary_info += {'libdw': libdw} - if host_os == 'freebsd' -- summary_info += {'libinotify-kqueue': inotify} - endif - if host_os == 'darwin' - summary_info += {'ParavirtualizedGraphics support': pvg} ---- util/meson.build.orig 2025-12-04 10:07:58 UTC -+++ util/meson.build -@@ -110,7 +110,6 @@ if have_block - if config_host_data.get('CONFIG_INOTIFY1') - freebsd_dep = [] - if host_os == 'freebsd' -- freebsd_dep = inotify - endif - util_ss.add(files('filemonitor-inotify.c'), freebsd_dep) - elsehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ee592d.21c2e.537f7f5>