forked from pool/xorg-x11-server
82 lines
2.3 KiB
Diff
82 lines
2.3 KiB
Diff
|
commit a18551cad1bf88b30d8466859509fb1fcfd1f2d6
|
||
|
|
Author: Adam Jackson <ajax@redhat.com>
|
||
|
|
Date: Wed Jul 2 11:25:50 2008 -0400
|
||
|
|
|
||
|
|
Fix GLX in Xvfb and kdrive.
|
||
|
|
(cherry picked from commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9)
|
||
|
|
|
||
|
|
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
|
||
|
|
index 81d3d69..7a56d34 100644
|
||
|
|
--- a/hw/kdrive/ephyr/Makefile.am
|
||
|
|
+++ b/hw/kdrive/ephyr/Makefile.am
|
||
|
|
@@ -85,5 +85,7 @@ Xephyr_DEPENDENCIES = \
|
||
|
|
$(LIBXEPHYR_HOSTDRI) \
|
||
|
|
@KDRIVE_LOCAL_LIBS@
|
||
|
|
|
||
|
|
+Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||
|
|
+
|
||
|
|
relink:
|
||
|
|
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
|
||
|
|
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
|
||
|
|
index 09d179e..76ed9fc 100644
|
||
|
|
--- a/hw/kdrive/fake/Makefile.am
|
||
|
|
+++ b/hw/kdrive/fake/Makefile.am
|
||
|
|
@@ -21,6 +21,8 @@ Xfake_LDADD = \
|
||
|
|
@KDRIVE_LIBS@ \
|
||
|
|
@XSERVER_LIBS@
|
||
|
|
|
||
|
|
+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||
|
|
+
|
||
|
|
Xfake_DEPENDENCIES = \
|
||
|
|
libfake.a \
|
||
|
|
@KDRIVE_LOCAL_LIBS@
|
||
|
|
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
|
||
|
|
index 420855b..cb12928 100644
|
||
|
|
--- a/hw/kdrive/fbdev/Makefile.am
|
||
|
|
+++ b/hw/kdrive/fbdev/Makefile.am
|
||
|
|
@@ -22,6 +22,8 @@ Xfbdev_DEPENDENCIES = \
|
||
|
|
libfbdev.a \
|
||
|
|
$(KDRIVE_PURE_LIBS)
|
||
|
|
|
||
|
|
+Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||
|
|
+
|
||
|
|
relink:
|
||
|
|
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
|
||
|
|
endif
|
||
|
|
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
|
||
|
|
index fe9309e..0973cb4 100644
|
||
|
|
--- a/hw/kdrive/sdl/Makefile.am
|
||
|
|
+++ b/hw/kdrive/sdl/Makefile.am
|
||
|
|
@@ -13,5 +13,7 @@ Xsdl_LDADD = \
|
||
|
|
|
||
|
|
Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
|
||
|
|
|
||
|
|
+Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||
|
|
+
|
||
|
|
relink:
|
||
|
|
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
|
||
|
|
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
|
||
|
|
index ac50d2b..4225dcf 100644
|
||
|
|
--- a/hw/kdrive/vesa/Makefile.am
|
||
|
|
+++ b/hw/kdrive/vesa/Makefile.am
|
||
|
|
@@ -27,5 +27,7 @@ Xvesa_DEPENDENCIES = \
|
||
|
|
libvesa.a \
|
||
|
|
@KDRIVE_LOCAL_LIBS@
|
||
|
|
|
||
|
|
+Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||
|
|
+
|
||
|
|
relink:
|
||
|
|
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
|
||
|
|
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
|
||
|
|
index 9ceeccc..a4a120a 100644
|
||
|
|
--- a/hw/vfb/Makefile.am
|
||
|
|
+++ b/hw/vfb/Makefile.am
|
||
|
|
@@ -26,6 +26,7 @@ XVFB_LIBS = \
|
||
|
|
|
||
|
|
Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||
|
|
Xvfb_DEPENDENCIES = $(XVFB_LIBS)
|
||
|
|
+Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||
|
|
|
||
|
|
# Man page
|
||
|
|
include $(top_srcdir)/cpprules.in
|