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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. From 2826691dcd01f470d30dc8eb3bbd24a96cd3a93c Mon Sep 17 00:00:00 2001
  2. From: "Yann E. MORIN" <yann.morin.1998@free.fr>
  3. Date: Sun, 23 Oct 2016 22:29:29 +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 | 1 -
  13. configure.ac | 9 ---------
  14. include/Makefile.am | 5 ++++-
  15. xorg-joystick.pc.in | 2 +-
  16. 4 files changed, 5 insertions(+), 12 deletions(-)
  17. diff --git a/Makefile.am b/Makefile.am
  18. index 13946b8..c1567ae 100644
  19. --- a/Makefile.am
  20. +++ b/Makefile.am
  21. @@ -18,7 +18,6 @@
  22. # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  23. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  24. -DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg
  25. SUBDIRS = src man config include
  26. MAINTAINERCLEANFILES = ChangeLog INSTALL
  27. diff --git a/configure.ac b/configure.ac
  28. index b5834a5..44b9d27 100644
  29. --- a/configure.ac
  30. +++ b/configure.ac
  31. @@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-module-dir,
  32. inputdir=${moduledir}/input
  33. AC_SUBST(inputdir)
  34. -# Define a configure option for an alternate X Server SDK Headers
  35. -# X Server SDK location is required to install joystick header files
  36. -AC_ARG_WITH(sdkdir,
  37. - AS_HELP_STRING([--with-sdkdir=<path>],
  38. - [Xorg X Server sdk headers (default is autodetected)]),
  39. - [sdkdir="$withval"],
  40. - [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
  41. -AC_SUBST(sdkdir)
  42. -
  43. # Define a configure option to enable code debugging
  44. AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug],
  45. [Disable debugging code (default: enabled)]),
  46. diff --git a/include/Makefile.am b/include/Makefile.am
  47. index ed618c2..d656568 100644
  48. --- a/include/Makefile.am
  49. +++ b/include/Makefile.am
  50. @@ -18,4 +18,7 @@
  51. # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  52. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  53. -sdk_HEADERS = joystick-properties.h
  54. +# Location formerly known as 'sdkdir'
  55. +xorgincludedir = $(includedir)/xorg
  56. +
  57. +xorginclude_HEADERS = joystick-properties.h
  58. diff --git a/xorg-joystick.pc.in b/xorg-joystick.pc.in
  59. index 76bb92f..a5972c7 100644
  60. --- a/xorg-joystick.pc.in
  61. +++ b/xorg-joystick.pc.in
  62. @@ -4,4 +4,4 @@ includedir=@includedir@
  63. Name: xorg-joystick
  64. Description: X.Org joystick input driver.
  65. Version: @PACKAGE_VERSION@
  66. -Cflags: -I${includedir}
  67. +Cflags: -I${includedir}/xorg
  68. --
  69. 2.7.4