xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/inputtest/Makefile.am |    2 +-
 hw/xfree86/drivers/inputtest/meson.build |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c5a9287dcf8d77ab104d56ac27ad6b1ff957fdfb
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed May 12 16:51:26 2021 +0100

    Don't underlink inputtest on targets which require complete linkage
    
    Don't underlink inputtest on targets which require complete linkage
    (e.g. when building for PE/COFF)

diff --git a/hw/xfree86/drivers/inputtest/Makefile.am b/hw/xfree86/drivers/inputtest/Makefile.am
index 8affc2535..f6210aa8d 100644
--- a/hw/xfree86/drivers/inputtest/Makefile.am
+++ b/hw/xfree86/drivers/inputtest/Makefile.am
@@ -31,7 +31,7 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(CWARNFLAGS)
 AM_CPPFLAGS = $(XORG_INCS)
 
 inputtest_drv_la_LTLIBRARIES = inputtest_drv.la
-inputtest_drv_la_LDFLAGS = -module -avoid-version
+inputtest_drv_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
 inputtest_drv_ladir = @moduledir@/input
 
 inputtest_drv_la_SOURCES = xf86-input-inputtest.c xf86-input-inputtest-protocol.h
diff --git a/hw/xfree86/drivers/inputtest/meson.build b/hw/xfree86/drivers/inputtest/meson.build
index 42b6ed197..fa642c89f 100644
--- a/hw/xfree86/drivers/inputtest/meson.build
+++ b/hw/xfree86/drivers/inputtest/meson.build
@@ -13,6 +13,8 @@ shared_module(
 
     install: true,
     install_dir: join_paths(module_dir, 'input'),
+
+    link_with: e,
 )
 
 install_man(configure_file(