diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-03 11:38:35 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-03 11:38:35 +0000 |
| commit | 5faf7780f65fa6df1d964606437585e79a1cb1d6 (patch) | |
| tree | 8f2e8b51d14e256a504d5fe453780b9c576cba91 /packages/libusb | |
| parent | a85bb4c46d5f14c09fd5578ed4b32d78fd08ccad (diff) | |
| parent | 915c1e3654c4be1667a9390c3671d1a3601e2a56 (diff) | |
merge of '74c5551c349d27c6ccb72cf2965707c633eb3cb9'
and 'f275c97e2c93f0e846205b213e997b28ed0b148e'
Diffstat (limited to 'packages/libusb')
| -rw-r--r-- | packages/libusb/libusb/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libusb/libusb/configure_fix.patch | 17 | ||||
| -rw-r--r-- | packages/libusb/libusb_0.1.12.bb | 7 |
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() { |