diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
| commit | a74b8da459dcdee1d1fc633d9d1856fdb89fd7bd (patch) | |
| tree | 291ff6b5793e74c8994696a7fe26e82f6f646601 /package/xorg-server | |
| parent | 33adad70313bb73464cbd002370cd14bade79a54 (diff) | |
fix musl compile, when xorg package collection is selected. X still does not work with musl
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 4 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index c37014d5c..3faa23e49 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -119,5 +119,9 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions endif + # add m4 file to host directory + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal + $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ + $(STAGING_HOST_DIR)/usr/share/aclocal include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h new file mode 100644 index 000000000..cd1c5c15c --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h @@ -0,0 +1,14 @@ +--- xorg-server-1.12.2.orig/hw/xfree86/os-support/xf86_OSlib.h 2012-05-17 19:09:03.000000000 +0200 ++++ xorg-server-1.12.2/hw/xfree86/os-support/xf86_OSlib.h 2013-10-29 15:23:18.000000000 +0100 +@@ -178,11 +178,7 @@ + #include <sys/types.h> + #include <assert.h> + +-#ifdef __linux__ +-#include <termio.h> +-#else /* __GLIBC__ */ + #include <termios.h> +-#endif + #ifdef __sparc__ + #include <sys/param.h> + #endif |