From 759d548e3e591f9bb8450b2874032d1824a5e251 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 22 Sep 2012 15:18:27 +0200 Subject: xserver_xorg-server: bump version Based on patch by Allan W. Nielsen. Signed-off-by: Peter Korsgaard --- ...server-02-supply-dl-code-with-dlopen-libs.patch | 87 ---------------------- 1 file changed, 87 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch (limited to 'package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch') diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch deleted file mode 100644 index 63d723bf3..000000000 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch +++ /dev/null @@ -1,87 +0,0 @@ -From d30637339963950910e5f5fb755b8465ac7dddb4 Mon Sep 17 00:00:00 2001 -From: Mikhail Gusarov -Date: Thu, 29 Oct 2009 18:46:22 +0000 -Subject: Supply all code using dl*() with DLOPEN_LIBS - -Previously DLOPEN_LIBS was managed in top-level configure.ac. -Instead bundle it with the code using dl*() functions to -avoid breakages in uncommon configurations. - -Signed-off-by: Mikhail Gusarov -Reviewed-by: Dan Nicholson -Signed-off-by: Keith Packard ---- -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -196,6 +196,7 @@ - dnl has it in libc), or if libdl is needed to get it. - AC_CHECK_FUNC([dlopen], [], - AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+AC_SUBST(DLOPEN_LIBS) - - dnl Checks for library functions. - AC_FUNC_VPRINTF -@@ -927,7 +928,7 @@ - AC_SUBST(XLIB_CFLAGS) - AC_DEFINE(GLXEXT, 1, [Build GLX extension]) - GLX_LIBS='$(top_builddir)/glx/libglx.la' -- GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" -+ GLX_SYS_LIBS="$GLX_SYS_LIBS" - else - GLX=no - fi -@@ -1483,7 +1484,7 @@ - AC_CHECK_FUNCS([pci_device_vgaarb_init]) - LIBS=$SAVE_LIBS - CFLAGS=$SAVE_CFLAGS -- XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" -+ XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIB" - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - - case $host_os in -Index: b/glx/Makefile.am -=================================================================== ---- a/glx/Makefile.am -+++ b/glx/Makefile.am -@@ -58,6 +58,8 @@ - libglxdri_la_SOURCES += glxdri2.c - endif - -+libglxdri_la_LIBADD = $(DLOPEN_LIBS) -+ - libglx_la_SOURCES = \ - $(indirect_sources) \ - $(glapi_sources) \ -@@ -95,3 +97,5 @@ - swap_interval.c \ - unpack.h \ - xfont.c -+ -+libglx_la_LIBADD = $(DLOPEN_LIBS) -Index: b/hw/xfree86/loader/Makefile.am -=================================================================== ---- a/hw/xfree86/loader/Makefile.am -+++ b/hw/xfree86/loader/Makefile.am -@@ -21,6 +21,7 @@ - dlloader.c \ - os.c \ - sdksyms.c -+libloader_la_LIBADD = $(DLOPEN_LIBS) - - CLEANFILES = sdksyms.c sdksyms.dep - -Index: b/os/Makefile.am -=================================================================== ---- a/os/Makefile.am -+++ b/os/Makefile.am -@@ -26,6 +26,8 @@ - xprintf.c \ - $(XORG_SRCS) - -+libos_la_LIBADD = $(DLOPEN_LIBS) -+ - if SECURE_RPC - libos_la_SOURCES += $(SECURERPC_SRCS) - endif -- cgit v1.2.3