0001-build-get-rid-of-sdkdir.patch 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. From aef3d9bca4d77db833f71d50b1c84b16c69d7deb Mon Sep 17 00:00:00 2001
  2. From: "Yann E. MORIN" <yann.morin.1998@free.fr>
  3. Date: Sun, 23 Oct 2016 22:53:21 +0200
  4. Subject: [PATCH] build: get rid of sdkdir
  5. Use of sdkdir causes problems during cross-compilation, where the full
  6. path is then appended to the DESTDIR, leading to host paths being
  7. appended in the target:
  8. https://bugs.busybox.net/show_bug.cgi?id=8696
  9. Other drivers (e.g. keyboard) got rid of sdkdir. Do the same.
  10. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  11. ---
  12. Makefile.am | 3 ---
  13. configure.ac | 10 ----------
  14. include/Makefile.am | 4 +++-
  15. xorg-mouse.pc.in | 3 +--
  16. 4 files changed, 4 insertions(+), 16 deletions(-)
  17. diff --git a/Makefile.am b/Makefile.am
  18. index 7142485..efe66cb 100644
  19. --- a/Makefile.am
  20. +++ b/Makefile.am
  21. @@ -34,9 +34,6 @@ ChangeLog:
  22. dist-hook: ChangeLog INSTALL
  23. -# Provide an sdk location that is writable by this module
  24. -DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
  25. -
  26. if LINT
  27. # Check source code with tools like lint & sparse
  28. lint:
  29. diff --git a/configure.ac b/configure.ac
  30. index 15d9047..515681d 100644
  31. --- a/configure.ac
  32. +++ b/configure.ac
  33. @@ -60,16 +60,6 @@ AC_ARG_WITH(xorg-module-dir,
  34. inputdir=${moduledir}/input
  35. AC_SUBST(inputdir)
  36. -# X Server SDK location is required to install xf86-mouse-properties.h
  37. -# This location is also relayed in the xorg-mouse.pc file
  38. -sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
  39. -
  40. -# Workaround overriding sdkdir to be able to create a tarball when user has no
  41. -# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
  42. -AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
  43. -AC_SUBST([sdkdir])
  44. -
  45. -
  46. # Work out which OS mouse driver we need to build
  47. case $host_os in
  48. linux*)
  49. diff --git a/include/Makefile.am b/include/Makefile.am
  50. index 27ce0fb..2b85e4e 100644
  51. --- a/include/Makefile.am
  52. +++ b/include/Makefile.am
  53. @@ -1 +1,3 @@
  54. -sdk_HEADERS = xf86-mouse-properties.h
  55. +# Location formerly known as 'sdkdir'
  56. +xorgincludedir = $(includedir)/xorg
  57. +xorginclude_HEADERS = xf86-mouse-properties.h
  58. diff --git a/xorg-mouse.pc.in b/xorg-mouse.pc.in
  59. index 57df596..8355e61 100644
  60. --- a/xorg-mouse.pc.in
  61. +++ b/xorg-mouse.pc.in
  62. @@ -1,6 +1,7 @@ prefix=@prefix@
  63. -sdkdir=@sdkdir@
  64. +prefix=@prefix@
  65. +includedir=@includedir@
  66. Name: xorg-mouse
  67. Description: X.Org mouse input driver for non-evdev OS'es
  68. Version: @PACKAGE_VERSION@
  69. -Cflags: -I${sdkdir}
  70. +Cflags: -I${includedir}/xorg
  71. --
  72. 2.7.4