package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch

   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
   6 Use of sdkdir causes problems during cross-compilation, where the full
   7 path is then appended to the DESTDIR, leading to host paths being
   8 appended in the target:
   9     https://bugs.busybox.net/show_bug.cgi?id=8696
  10
  11 Other drivers (e.g. keyboard) got rid of sdkdir. Do the same.
  12
  13 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  14 ---
  15  Makefile.am         | 2 --
  16  configure.ac        | 8 --------
  17  include/Makefile.am | 4 +++-
  18  xorg-libinput.pc.in | 5 +++--
  19  4 files changed, 6 insertions(+), 13 deletions(-)
  20
  21 diff --git a/Makefile.am b/Makefile.am
  22 index a447d61..7aa5523 100644
  23 --- a/Makefile.am
  24 +++ b/Makefile.am
  25 @@ -19,8 +19,6 @@
  26  #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  27
  28
  29 -DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
  30 -
  31  SUBDIRS = src include man test
  32  MAINTAINERCLEANFILES = ChangeLog INSTALL
  33
  34 diff --git a/configure.ac b/configure.ac
  35 index 9894817..fe198cb 100644
  36 --- a/configure.ac
  37 +++ b/configure.ac
  38 @@ -63,14 +63,6 @@ AC_ARG_WITH(xorg-conf-dir,
  39              [xorgconfdir='${prefix}/share/X11/xorg.conf.d'])
  40  AC_SUBST(xorgconfdir)
  41
  42 -# X Server SDK location is required to install header files
  43 -sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
  44 -
  45 -# Workaround overriding sdkdir to be able to create a tarball when user has no
  46 -# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
  47 -AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
  48 -AC_SUBST([sdkdir])
  49 -
  50  DRIVER_NAME=libinput
  51  AC_SUBST([DRIVER_NAME])
  52
  53 diff --git a/include/Makefile.am b/include/Makefile.am
  54 index 0d52b9b..271ffac 100644
  55 --- a/include/Makefile.am
  56 +++ b/include/Makefile.am
  57 @@ -1 +1,3 @@
  58 -sdk_HEADERS = libinput-properties.h
  59 +# Location formerly known as 'sdkdir'
  60 +xorgincludedir = $(includedir)/xorg
  61 +xorginclude_HEADERS = libinput-properties.h
  62 diff --git a/xorg-libinput.pc.in b/xorg-libinput.pc.in
  63 index ff98189..9c0f506 100644
  64 --- a/xorg-libinput.pc.in
  65 +++ b/xorg-libinput.pc.in
  66 @@ -1,6 +1,7 @@
  67 -sdkdir=@sdkdir@
  68 +prefix=@prefix@
  69 +includedir=@includedir@
  70
  71  Name: xorg-libinput
  72  Description: X.Org libinput input driver.
  73  Version: @PACKAGE_VERSION@
  74 -Cflags: -I${sdkdir}
  75 +Cflags: -I${includedir}/xorg
  76 --
  77 2.7.4
  78