2 files changed, 22 insertions, 2 deletions

diff --git a/meta/packages/libusb/libusb/configure_fix.patch b/meta/packages/libusb/libusb/configure_fix.patch
new file mode 100644
index 0000000000..78d3cdb10e
--- /dev/null
+++ b/meta/packages/libusb/libusb/configure_fix.patch
@@ -0,0 +1,17 @@
+For some reason libtool 2.2.2 can't cope with this, LT_LANG(C++) works though.
+
+RP - 14/4/08
+
+Index: libusb-0.1.12/configure.in
+===================================================================
+--- libusb-0.1.12.orig/configure.in     2008-04-14 22:08:26.000000000 +0100
++++ libusb-0.1.12/configure.in  2008-04-14 22:09:43.000000000 +0100
+@@ -149,7 +149,7 @@
+ fi
+ 
+ # Checks for programs.
+-AC_LANG_CPLUSPLUS
++LT_LANG(C++)
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
diff --git a/meta/packages/libusb/libusb_0.1.12.bb b/meta/packages/libusb/libusb_0.1.12.bb
index 43c6ea92bd..7b5806f658 100644
--- a/meta/packages/libusb/libusb_0.1.12.bb
+++ b/meta/packages/libusb/libusb_0.1.12.bb
@@ -3,9 +3,12 @@ access to USB devices."
 HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
+           file://configure_fix.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libusb"
 
 S = "${WORKDIR}/libusb-${PV}"