xserver: Branch 'master'
Eric Anholt
anholt at kemper.freedesktop.org
Mon May 15 16:15:04 UTC 2017
hw/xfree86/drivers/modesetting/meson.build | 2 -
hw/xfree86/loader/symbol-test.c | 3 --
hw/xfree86/meson.build | 42 ++++++++++++++++++++---------
3 files changed, 31 insertions(+), 16 deletions(-)
New commits:
commit 7a19a3e093a62a779c3cab8c28930adcb1604e0d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon May 8 10:24:34 2017 +1000
xfree86: build a shared lib identical to Xorg
Because we can use a shared lib in dlsym() for the symbol loader test,
but we can't use the executable.
v2: Drop a stray ' ' and rebase on 820a4cbe9fe, by anholt
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/hw/xfree86/drivers/modesetting/meson.build b/hw/xfree86/drivers/modesetting/meson.build
index e97dac36d..ab3227605 100644
--- a/hw/xfree86/drivers/modesetting/meson.build
+++ b/hw/xfree86/drivers/modesetting/meson.build
@@ -28,7 +28,7 @@ shared_module(
# Test that we don't have any unresolved symbols from our module to Xorg.
xorg_build_root = join_paths(meson.build_root(), 'hw', 'xfree86')
symbol_test_args = []
-symbol_test_args += join_paths(xorg_build_root, 'Xorg')
+symbol_test_args += join_paths(xorg_build_root, 'libxorgserver.so')
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libfb.so')
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
if build_glamor
diff --git a/hw/xfree86/loader/symbol-test.c b/hw/xfree86/loader/symbol-test.c
index 6b4eb1a71..1d7d84635 100644
--- a/hw/xfree86/loader/symbol-test.c
+++ b/hw/xfree86/loader/symbol-test.c
@@ -35,8 +35,7 @@ int main (int argc, char**argv)
if (argc < 2) {
fprintf(stderr,
- "Must pass path of Xorg executable and any "
- "modules to be loaded.\n");
+ "Must pass path any modules to be loaded.\n");
exit(1);
}
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 5360c22b9..1df7313fe 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -92,25 +92,41 @@ if build_dri2
xorg_link += xorg_dri2
endif
+xorg_deps = [
+ pixman_dep,
+ m_dep,
+ dl_dep,
+ pciaccess_dep,
+ sha1_dep,
+ dependency('xau'),
+ xdmcp_dep,
+ xfont2_dep,
+ xshmfence_dep,
+ config_dep,
+ libdrm_dep,
+]
+
executable(
'Xorg',
srcs_xorg,
include_directories: [inc, xorg_inc],
link_whole: xorg_link,
- dependencies: [
- pixman_dep,
- m_dep,
- dl_dep,
- pciaccess_dep,
- sha1_dep,
- dependency('xau'),
- xdmcp_dep,
- xfont2_dep,
- xshmfence_dep,
- config_dep,
- libdrm_dep,
- ],
+ dependencies: xorg_deps,
link_args: '-Wl,--export-dynamic',
c_args: xorg_c_args,
install: true,
)
+
+# For symbol presence testing only
+xorgserver_lib = shared_library(
+ 'xorgserver',
+ srcs_xorg,
+ include_directories: [inc, xorg_inc],
+ link_whole: xorg_link,
+ dependencies: xorg_deps,
+ link_args: '-Wl,--export-dynamic',
+ c_args: xorg_c_args,
+ install: false,
+)
+
+xorgserver_dep = declare_dependency(link_with: xorgserver_lib)
More information about the xorg-commit
mailing list