aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-02-04 16:00:19 -0800
committerKhem Raj <raj.khem@gmail.com>2021-02-04 16:02:06 -0800
commitf9f931719640503292fa429da12a082008d0056d (patch)
treed56716dff6c217dc73a5c60e4c0ee67ce271529a /meta-oe
parent20540303ea72e8d15f34f6557caf8c3238730497 (diff)
downloadmeta-openembedded-contrib-f9f931719640503292fa429da12a082008d0056d.tar.gz
hidapi: Backport patch to fix build with autotools 2.70+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch27
-rw-r--r--meta-oe/recipes-support/hidapi/hidapi_git.bb4
2 files changed, 30 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch b/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch
new file mode 100644
index 0000000000..f3cd1015f9
--- /dev/null
+++ b/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch
@@ -0,0 +1,27 @@
+From ce3ab6ba4b8176d100ac535a39e3d5b0c517989b Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler@pld-linux.org>
+Date: Fri, 15 Jan 2021 14:32:14 +0100
+Subject: [PATCH] configure.ac: remove duplicate AC_CONFIG_MACRO_DIR (#226)
+
+fixes build with autoconf 2.70
+Upstream-Status: Backport [https://github.com/libusb/hidapi/pull/226]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 220909a..77da67a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
+
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+-AC_CONFIG_MACRO_DIR([m4])
+
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ LT_INIT
+--
+2.30.0
+
diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_git.bb
index df68a850a4..76f5dc7624 100644
--- a/meta-oe/recipes-support/hidapi/hidapi_git.bb
+++ b/meta-oe/recipes-support/hidapi/hidapi_git.bb
@@ -10,7 +10,9 @@ DEPENDS = "libusb udev"
inherit autotools pkgconfig
-SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https"
+SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https \
+ file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \
+"
PV = "0.10.1"
SRCREV = "f6d0073fcddbdda24549199445e844971d3c9cef"
S = "${WORKDIR}/git"