summaryrefslogtreecommitdiff
path: root/packages/libusb
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-06-02 11:33:23 +0000
committerKoen Kooi <koen@openembedded.org>2008-06-02 11:33:23 +0000
commitd8b4844e48bf3eb0e43cd69d9cc993d3102e302d (patch)
tree013c08c548c16a8081f0830db2fa3b9590b38581 /packages/libusb
parenta3bb958e5c5543b6dc9c43acc12df238b7d3a332 (diff)
libusb: add libtool patch from poky, safe for general consumption
Diffstat (limited to 'packages/libusb')
-rw-r--r--packages/libusb/libusb/.mtn2git_empty0
-rw-r--r--packages/libusb/libusb/configure_fix.patch17
-rw-r--r--packages/libusb/libusb_0.1.12.bb7
3 files changed, 21 insertions, 3 deletions
diff --git a/packages/libusb/libusb/.mtn2git_empty b/packages/libusb/libusb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libusb/libusb/.mtn2git_empty
diff --git a/packages/libusb/libusb/configure_fix.patch b/packages/libusb/libusb/configure_fix.patch
new file mode 100644
index 0000000000..f01f0143f5
--- /dev/null
+++ b/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
++AC_PROG_CXX
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb
index 43c6ea92bd..3d6a213b45 100644
--- a/packages/libusb/libusb_0.1.12.bb
+++ b/packages/libusb/libusb_0.1.12.bb
@@ -3,9 +3,10 @@ access to USB devices."
HOMEPAGE = "http://libusb.sf.net"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r3"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
+ file://configure_fix.patch;patch=1"
S = "${WORKDIR}/libusb-${PV}"
@@ -14,7 +15,7 @@ inherit autotools pkgconfig binconfig lib_package
PARALLEL_MAKE = ""
EXTRA_OECONF = "--disable-build-docs"
-export CXXFLAGS += "-lstdc++"
+export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}"
do_stage() {