Date: Mon, 27 Apr 2026 18:37:45 +0200 From: "Herbert J. Skuhra" <herbert@gojira.at> To: "Muhammad Moinur Rahman" <bofh@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: f816572e04c2 - main - emulators/qemu: Fix build with 15 and later Message-ID: <b6e01a87-b08a-438d-b874-d64023dbbdfe@app.fastmail.com> In-Reply-To: <69ee592d.21c2e.537f7f5@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
On Sun, 26 Apr 2026, at 20:27, Muhammad Moinur Rahman wrote: > 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/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) > - else The file is still referenced in the Makefile: 128 .if exists(/usr/include/sys/inotify.h) 129 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-meson.build 130 .endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b6e01a87-b08a-438d-b874-d64023dbbdfe>