summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-02-09 15:28:10 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-05-27 07:16:02 +0000
commitb5b529799a20f8a262066daeb726307c0631f208 (patch)
tree6c1bc27d8cf7e1d44eb41286d9b66dd43c00e517 /include
parentbe731e0bdc7d76ad3782d5b533b6bcc8378f41ad (diff)
meson: split udev from udev_kms which requires systemd
DragonFly and FreeBSD can use xf86-input-libinput with config/udev. ld: error: undefined symbol: xf86PlatformDeviceProbe >>> referenced by xf86platformBus.c >>> xf86platformBus.c.o:(xf86platformProbe) in archive hw/xfree86/common/libxorg_common.a ld: error: undefined symbol: xf86PlatformDeviceCheckBusID >>> referenced by xf86platformBus.c >>> xf86platformBus.c.o:(xf86platformProbeDev) in archive hw/xfree86/common/libxorg_common.a ld: error: undefined symbol: xf86PlatformReprobeDevice >>> referenced by xf86platformBus.c >>> xf86platformBus.c.o:(xf86platformVTProbe) in archive hw/xfree86/common/libxorg_common.a ld: error: undefined symbol: NewGPUDeviceRequest >>> referenced by udev.c >>> udev.c.o:(device_added) in archive config/liblibxserver_config.a ld: error: undefined symbol: DeleteGPUDeviceRequest >>> referenced by udev.c >>> udev.c.o:(device_removed) in archive config/liblibxserver_config.a
Diffstat (limited to 'include')
-rw-r--r--include/meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/meson.build b/include/meson.build
index ed9b3619e..0b89499c0 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -86,7 +86,7 @@ conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
# Note: this symbol is used by libXtrans.
conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found())
conf_data.set('CONFIG_UDEV', build_udev)
-conf_data.set('CONFIG_UDEV_KMS', build_udev)
+conf_data.set('CONFIG_UDEV_KMS', build_udev_kms)
conf_data.set('HAVE_DBUS', build_dbus)
conf_data.set('CONFIG_HAL', build_hal)
conf_data.set('SYSTEMD_LOGIND', build_systemd_logind)
@@ -310,7 +310,7 @@ conf_data.set('PCVT_SUPPORT', supports_pcvt)
conf_data.set('SYSCONS_SUPPORT', supports_syscons)
conf_data.set('WSCONS_SUPPORT', supports_wscons)
conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
-conf_data.set('XSERVER_PLATFORM_BUS', build_udev)
+conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms)
configure_file(output : 'dix-config.h',
configuration : conf_data)
@@ -359,7 +359,7 @@ xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', join_paths(get_option('prefix'), ge
xorg_data.set_quoted('__XSERVERNAME__', 'Xorg')
xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
xorg_data.set_quoted('PCI_TXT_IDS_PATH', '')
-xorg_data.set('XSERVER_PLATFORM_BUS', build_udev)
+xorg_data.set('XSERVER_PLATFORM_BUS', build_udev_kms)
xorg_data.set('WSCONS_SUPPORT', host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd')
xorg_data.set('HAVE_STROPTS_H', cc.has_header('stropts.h'))
xorg_data.set('HAVE_SYS_KD_H', cc.has_header('sys/kd.h'))