summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch19
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk2
2 files changed, 0 insertions, 21 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
deleted file mode 100644
index bde5ed6629..0000000000
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server-400-fix-man.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix race condition when installing man page
-
-Fixes
-http://autobuild.buildroot.net/results/11e/11ece737078ca8da2fee4249432148675b4e630e/
-http://autobuild.buildroot.net/results/a95/a952932b832ee3296d6c225c7a9df408ca3eef9f/
-
-Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=79396
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr xorg-server-1.15.1.org/man/Makefile.am xorg-server-1.15.1/man/Makefile.am
---- xorg-server-1.15.1.org/man/Makefile.am 2014-03-22 06:37:53.000000000 +0100
-+++ xorg-server-1.15.1/man/Makefile.am 2014-05-29 09:27:48.808356591 +0200
-@@ -4,3 +4,5 @@
-
- include $(top_srcdir)/manpages.am
- appman_PRE = Xserver.man
-+
-+.NOTPARALLEL:
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 2471c71ab6..ece528c5d1 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -9,9 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
XSERVER_XORG_SERVER_LICENSE = MIT
XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
-XSERVER_XORG_SERVER_AUTORECONF = YES
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
XSERVER_XORG_SERVER_DEPENDENCIES = \
xutil_util-macros \
xlib_libXfont \
OpenPOWER on IntegriCloud