summarylogtreecommitdiffstats
path: root/0002-fix-libshadow-2.patch
diff options
context:
space:
mode:
Diffstat (limited to '0002-fix-libshadow-2.patch')
-rw-r--r--0002-fix-libshadow-2.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/0002-fix-libshadow-2.patch b/0002-fix-libshadow-2.patch
new file mode 100644
index 000000000000..d98c6fd4beda
--- /dev/null
+++ b/0002-fix-libshadow-2.patch
@@ -0,0 +1,30 @@
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
+
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
++++ b/hw/xfree86/dixmods/meson.build
+@@ -34,7 +34,7 @@ shared_module(
+ c_args: xorg_c_args,
+ dependencies: common_dep,
+ link_whole: libxserver_miext_shadow,
+- link_with: [fb, e],
++ link_with: e,
+
+ install: true,
+ install_dir: module_dir,
+--
+2.22.0
+