aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2018-04-11 00:59:12 +0200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-05-14 10:37:44 +1200
commit57ef3016ec13ad5a92ed63c30bf018133aef171a (patch)
tree6569d7d53a83637870a9520f612d81c4268a68e9
parent4a154c5a56f0f192e970fa65a91b6b2f952434ae (diff)
downloadmeta-handheld-57ef3016ec13ad5a92ed63c30bf018133aef171a.tar.gz
meta-handheld-57ef3016ec13ad5a92ed63c30bf018133aef171a.tar.bz2
meta-handheld-57ef3016ec13ad5a92ed63c30bf018133aef171a.zip
zaurusd: relax Autoconf macro to allow tslib >= 1.0
Fix build after 72ef78e tslib: Upgrade to 1.15 release Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-bsp/zaurusd/zaurusd/allow-newer-tslib.patch31
-rw-r--r--recipes-bsp/zaurusd/zaurusd_git.bb3
2 files changed, 33 insertions, 1 deletions
diff --git a/recipes-bsp/zaurusd/zaurusd/allow-newer-tslib.patch b/recipes-bsp/zaurusd/zaurusd/allow-newer-tslib.patch
new file mode 100644
index 0000000..8269148
--- /dev/null
+++ b/recipes-bsp/zaurusd/zaurusd/allow-newer-tslib.patch
@@ -0,0 +1,31 @@
+From 368e025220842db13e8b5d95bfe12877d752a7c8 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Wed, 11 Apr 2018 00:14:49 +0200
+Subject: [PATCH] zaurusd: relax Autoconf macro to allow tslib >= 1.0
+
+Fix build after 72ef78e tslib: Upgrade to 1.15 release
+
+| checking for "tslib-1.0"... no
+| configure: error: TSKeys requires tslib.
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36f858c..b207dcf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,7 @@ if test "x$HAVE_TSKEYS" != "x"; then
+ #
+ # Checks for tslib
+ #
+- PKG_CHECK_MODULES(TSLIB, "tslib-1.0", :, AC_MSG_ERROR([TSKeys requires tslib.]))
++ PKG_CHECK_MODULES(TSLIB, [tslib >= 1.0], :, AC_MSG_ERROR([TSKeys requires tslib.]))
+ AC_SUBST(TSLIB_CFLAGS)
+ AC_SUBST(TSLIB_LIBS)
+ fi
+--
+2.7.4
+
diff --git a/recipes-bsp/zaurusd/zaurusd_git.bb b/recipes-bsp/zaurusd/zaurusd_git.bb
index 8a49fdc..d69805b 100644
--- a/recipes-bsp/zaurusd/zaurusd_git.bb
+++ b/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -23,7 +23,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://01-check-toggle-landscape \
file://01-check-toggle-portait \
file://use-ts-symlink-instead-of-hardcoding.diff \
- file://0001-zaurusd-add-support-for-collie.patch"
+ file://0001-zaurusd-add-support-for-collie.patch \
+ file://allow-newer-tslib.patch"
S = "${WORKDIR}/git"