Date: Mon, 26 Jan 2026 23:00:37 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e437c6ec629f - main - x11-servers/xlibre-server: fix build on armv7 Message-ID: <6977f215.3c253.bd3fecb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e437c6ec629f7d5b9a0617b15e5da69fa2348fad commit e437c6ec629f7d5b9a0617b15e5da69fa2348fad Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-01-23 13:50:10 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-01-26 22:59:49 +0000 x11-servers/xlibre-server: fix build on armv7 This ensures USE_DEV_IO=1 is set on armv7. See also: b632464b29fc330113280495ef76d0f825058ae8 Approved by: portmgr (build fix blanket) MFH: 2026Q1 --- .../{patch-fix-epoll => patch-include_meson.build} | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/x11-servers/xlibre-server/files/patch-fix-epoll b/x11-servers/xlibre-server/files/patch-include_meson.build similarity index 52% rename from x11-servers/xlibre-server/files/patch-fix-epoll rename to x11-servers/xlibre-server/files/patch-include_meson.build index 1e5c15aafbaf..78335b46a505 100644 --- a/x11-servers/xlibre-server/files/patch-fix-epoll +++ b/x11-servers/xlibre-server/files/patch-include_meson.build @@ -1,6 +1,6 @@ ---- include/meson.build.orig +--- include/meson.build.orig 2025-12-21 14:53:30 UTC +++ include/meson.build -@@ -141,7 +141,7 @@ conf_data.set('HAVE_SYS_SYSMACROS_H', cc.has_header('sys/sysmacros.h') ? '1' : f +@@ -139,7 +139,7 @@ conf_data.set('HAVE_CBRT', cc.has_function('cbrt') ? ' conf_data.set('HAVE_ARC4RANDOM_BUF', cc.has_function('arc4random_buf', dependencies: libbsd_dep) ? '1' : false) conf_data.set('HAVE_BACKTRACE', cc.has_function('backtrace') ? '1' : false) conf_data.set('HAVE_CBRT', cc.has_function('cbrt') ? '1' : false) @@ -9,11 +9,20 @@ conf_data.set('HAVE_GETUID', cc.has_function('getuid') ? '1' : false) conf_data.set('HAVE_GETEUID', cc.has_function('geteuid') ? '1' : false) conf_data.set('HAVE_ISASTREAM', cc.has_function('isastream') ? '1' : false) ---- meson.build.orig +@@ -379,7 +379,7 @@ if host_machine.system() == 'freebsd' or host_machine. + xorg_data.set('HAVE_MODESETTING_DRIVER', build_modesetting ? '1' : false) + + if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly' +- if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64' ++ if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64' or host_machine.cpu_family() == 'arm' + xorg_data.set('USE_DEV_IO', '1') + endif + elif host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd' +--- meson.build.orig 2025-12-21 14:53:30 UTC +++ meson.build -@@ -456,10 +456,8 @@ endif +@@ -506,10 +506,8 @@ if host_machine.system() in ['freebsd', 'openbsd', 'dr - if host_machine.system() in ['freebsd', 'openbsd'] + if host_machine.system() in ['freebsd', 'openbsd', 'dragonfly'] epoll_dep = dependency('epoll-shim') - epoll_inc = join_paths(epoll_dep.get_variable('prefix'), get_option('includedir'), 'libepoll-shim') else @@ -22,7 +31,7 @@ endif have_eventfd = cc.has_header('sys/eventfd.h', dependencies: epoll_dep) -@@ -614,7 +612,6 @@ inc = include_directories( +@@ -666,7 +664,6 @@ inc = include_directories( 'randr', 'render', 'xfixes',home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6977f215.3c253.bd3fecb>