diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-03 23:22:42 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-03 23:22:42 +0000 |
| commit | 91818574fb20e98aed69f4f4586e3f971e17f013 (patch) | |
| tree | e025ebd5590ec3ca7edf69a871753f85e10598f5 /packages/libusb | |
| parent | c73693c12be6d852f243ed5bb5b8d585943e8003 (diff) | |
| parent | 84a4706fc5292c926fb1126857cd350b62ddd0b4 (diff) | |
merge of '4b865f129d7c784106bb82861c16cc6330c629a9'
and '7e82eca3f8662bfb12dc49e93daed21b2aa8feeb'
Diffstat (limited to 'packages/libusb')
| -rw-r--r-- | packages/libusb/libusb_0.1.10a.bb | 5 | ||||
| -rw-r--r-- | packages/libusb/libusb_0.1.12.bb | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb index a62d9ae83e..8648f96571 100644 --- a/packages/libusb/libusb_0.1.10a.bb +++ b/packages/libusb/libusb_0.1.10a.bb @@ -22,6 +22,11 @@ do_stage() { install -m 755 ${S}/libusb-config ${STAGING_BINDIR} perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config + if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then + install -d ${STAGING_BINDIR_CROSS}/ + mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config + fi + install -d ${STAGING_INCDIR}/ for X in usb.h do diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb index fea8e57ccf..43c6ea92bd 100644 --- a/packages/libusb/libusb_0.1.12.bb +++ b/packages/libusb/libusb_0.1.12.bb @@ -9,24 +9,25 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz" S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" +export CXXFLAGS += "-lstdc++" + do_stage() { - oe_libinstall -a -so libusb ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR} + autotools_stage_all install -m 755 ${S}/libusb-config ${STAGING_BINDIR} # can we get rid of that? wouldn't a sed statement do as well? - perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config + sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config + + if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then + install -d ${STAGING_BINDIR_CROSS}/ + mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config + fi - install -d ${STAGING_INCDIR}/ - for X in usb.h - do - install -m 0644 ${S}/$X ${STAGING_INCDIR}/$X - done } PACKAGES =+ "libusbpp" |