diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-support/libusb/libusb1_1.0.18.bb | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch deleted file mode 100644 index b1dd66c969..0000000000 --- a/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://libusb.org/ticket/159] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac ---- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300 -+++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200 -@@ -31,7 +31,7 @@ - - AC_CONFIG_SRCDIR([libusb/core.c]) - AC_CONFIG_MACRO_DIR([m4]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - - AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb1_1.0.18.bb b/meta/recipes-support/libusb/libusb1_1.0.18.bb index c64f1dba21..395145af10 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.18.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.18.bb @@ -18,7 +18,9 @@ S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--libdir=${base_libdir}" +# Don't configure udev by default since it will cause a circular +# dependecy with udev package, which depends on libusb +EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev" do_install_append() { install -d ${D}${libdir} |