mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-01 15:37:44 +00:00
package/xdriver_xf86-input-mouse: fix install paths
Get rid of the borked sdkdir variable. Fixes (partially): https://bugs.busybox.net/show_bug.cgi?id=8696 Reported-by: buildroot@netsolux.ch Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: buildroot@netsolux.ch Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
b8bd2bea3b
commit
3065189a0a
@ -0,0 +1,81 @@
|
|||||||
|
From aef3d9bca4d77db833f71d50b1c84b16c69d7deb Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
|
Date: Sun, 23 Oct 2016 22:53:21 +0200
|
||||||
|
Subject: [PATCH] build: get rid of sdkdir
|
||||||
|
|
||||||
|
Use of sdkdir causes problems during cross-compilation, where the full
|
||||||
|
path is then appended to the DESTDIR, leading to host paths being
|
||||||
|
appended in the target:
|
||||||
|
https://bugs.busybox.net/show_bug.cgi?id=8696
|
||||||
|
|
||||||
|
Other drivers (e.g. keyboard) got rid of sdkdir. Do the same.
|
||||||
|
|
||||||
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
|
---
|
||||||
|
Makefile.am | 3 ---
|
||||||
|
configure.ac | 10 ----------
|
||||||
|
include/Makefile.am | 4 +++-
|
||||||
|
xorg-mouse.pc.in | 3 +--
|
||||||
|
4 files changed, 4 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index 7142485..efe66cb 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -34,9 +34,6 @@ ChangeLog:
|
||||||
|
|
||||||
|
dist-hook: ChangeLog INSTALL
|
||||||
|
|
||||||
|
-# Provide an sdk location that is writable by this module
|
||||||
|
-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
|
||||||
|
-
|
||||||
|
if LINT
|
||||||
|
# Check source code with tools like lint & sparse
|
||||||
|
lint:
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 15d9047..515681d 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -60,16 +60,6 @@ AC_ARG_WITH(xorg-module-dir,
|
||||||
|
inputdir=${moduledir}/input
|
||||||
|
AC_SUBST(inputdir)
|
||||||
|
|
||||||
|
-# X Server SDK location is required to install xf86-mouse-properties.h
|
||||||
|
-# This location is also relayed in the xorg-mouse.pc file
|
||||||
|
-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
|
||||||
|
-
|
||||||
|
-# Workaround overriding sdkdir to be able to create a tarball when user has no
|
||||||
|
-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
|
||||||
|
-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
|
||||||
|
-AC_SUBST([sdkdir])
|
||||||
|
-
|
||||||
|
-
|
||||||
|
# Work out which OS mouse driver we need to build
|
||||||
|
case $host_os in
|
||||||
|
linux*)
|
||||||
|
diff --git a/include/Makefile.am b/include/Makefile.am
|
||||||
|
index 27ce0fb..2b85e4e 100644
|
||||||
|
--- a/include/Makefile.am
|
||||||
|
+++ b/include/Makefile.am
|
||||||
|
@@ -1 +1,3 @@
|
||||||
|
-sdk_HEADERS = xf86-mouse-properties.h
|
||||||
|
+# Location formerly known as 'sdkdir'
|
||||||
|
+xorgincludedir = $(includedir)/xorg
|
||||||
|
+xorginclude_HEADERS = xf86-mouse-properties.h
|
||||||
|
diff --git a/xorg-mouse.pc.in b/xorg-mouse.pc.in
|
||||||
|
index 57df596..8355e61 100644
|
||||||
|
--- a/xorg-mouse.pc.in
|
||||||
|
+++ b/xorg-mouse.pc.in
|
||||||
|
@@ -1,6 +1,7 @@ prefix=@prefix@
|
||||||
|
-sdkdir=@sdkdir@
|
||||||
|
+prefix=@prefix@
|
||||||
|
+includedir=@includedir@
|
||||||
|
|
||||||
|
Name: xorg-mouse
|
||||||
|
Description: X.Org mouse input driver for non-evdev OS'es
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
-Cflags: -I${sdkdir}
|
||||||
|
+Cflags: -I${includedir}/xorg
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
@ -10,5 +10,6 @@ XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/
|
|||||||
XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT
|
XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT
|
||||||
XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING
|
XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING
|
||||||
XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
|
XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
|
||||||
|
XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
$(eval $(autotools-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user