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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. From 1b2cf6e6c2640e08166af36eee775542a45325af Mon Sep 17 00:00:00 2001
  2. From: "Yann E. MORIN" <yann.morin.1998@free.fr>
  3. Date: Sun, 23 Oct 2016 22:36:40 +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 | 2 --
  13. configure.ac | 8 --------
  14. include/Makefile.am | 4 +++-
  15. xorg-libinput.pc.in | 5 +++--
  16. 4 files changed, 6 insertions(+), 13 deletions(-)
  17. diff --git a/Makefile.am b/Makefile.am
  18. index a447d61..7aa5523 100644
  19. --- a/Makefile.am
  20. +++ b/Makefile.am
  21. @@ -19,8 +19,6 @@
  22. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  23. -DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
  24. -
  25. SUBDIRS = src include man test
  26. MAINTAINERCLEANFILES = ChangeLog INSTALL
  27. diff --git a/configure.ac b/configure.ac
  28. index 9894817..fe198cb 100644
  29. --- a/configure.ac
  30. +++ b/configure.ac
  31. @@ -63,14 +63,6 @@ AC_ARG_WITH(xorg-conf-dir,
  32. [xorgconfdir='${prefix}/share/X11/xorg.conf.d'])
  33. AC_SUBST(xorgconfdir)
  34. -# X Server SDK location is required to install header files
  35. -sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
  36. -
  37. -# Workaround overriding sdkdir to be able to create a tarball when user has no
  38. -# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
  39. -AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
  40. -AC_SUBST([sdkdir])
  41. -
  42. DRIVER_NAME=libinput
  43. AC_SUBST([DRIVER_NAME])
  44. diff --git a/include/Makefile.am b/include/Makefile.am
  45. index 0d52b9b..271ffac 100644
  46. --- a/include/Makefile.am
  47. +++ b/include/Makefile.am
  48. @@ -1 +1,3 @@
  49. -sdk_HEADERS = libinput-properties.h
  50. +# Location formerly known as 'sdkdir'
  51. +xorgincludedir = $(includedir)/xorg
  52. +xorginclude_HEADERS = libinput-properties.h
  53. diff --git a/xorg-libinput.pc.in b/xorg-libinput.pc.in
  54. index ff98189..9c0f506 100644
  55. --- a/xorg-libinput.pc.in
  56. +++ b/xorg-libinput.pc.in
  57. @@ -1,6 +1,7 @@
  58. -sdkdir=@sdkdir@
  59. +prefix=@prefix@
  60. +includedir=@includedir@
  61. Name: xorg-libinput
  62. Description: X.Org libinput input driver.
  63. Version: @PACKAGE_VERSION@
  64. -Cflags: -I${sdkdir}
  65. +Cflags: -I${includedir}/xorg
  66. --
  67. 2.7.4