summary refs log tree commit diff
path: root/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-12-27 12:03:04 -0500
committerMark H Weaver <mhw@netris.org>2014-12-27 12:03:04 -0500
commitf9930cfaabe631e2b90f4ee3d30b149f0e3aaae4 (patch)
tree8a901e6acebe892664e52d499c5c596a591dc178 /gnu/packages/patches/xf86-video-r128-glibc-2.20.patch
parentbf7688fe4d8624ed9bddc8f7f3887df5f1fc3957 (diff)
parent7f9b77dc465f35a3689036e12d0bf85ed7d81f52 (diff)
downloadguix-f9930cfaabe631e2b90f4ee3d30b149f0e3aaae4.tar.gz
Merge branch 'xorg-updates'
Diffstat (limited to 'gnu/packages/patches/xf86-video-r128-glibc-2.20.patch')
-rw-r--r--gnu/packages/patches/xf86-video-r128-glibc-2.20.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch b/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch
new file mode 100644
index 0000000000..21a430ebc6
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch
@@ -0,0 +1,17 @@
+Fix test compilation with exa.h in configure when using glibc 2.20.
+Inspired by a patch by Peter Hutterer <peter.hutterer@who-t.net>.
+See <https://raw.githubusercontent.com/openembedded/oe-core/master/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch>.
+
+--- xf86-video-r128-6.9.2/configure.~1~	2013-10-02 14:38:15.000000000 -0400
++++ xf86-video-r128-6.9.2/configure	2014-12-19 01:23:03.346735159 -0500
+@@ -18400,7 +18400,9 @@
+ 
+         SAVE_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+-        ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default"
++        ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default
++#include <xorg-server.h>
++"
+ if test "x$ac_cv_header_exa_h" = xyes; then :
+   have_exa_h="yes"
+ else