diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 16:13:03 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 16:13:03 +0000 |
| commit | 6cad69b4d8b6e626870f4f9ffb91239ab886550d (patch) | |
| tree | 105b08957009f880ad98b015facf4cdd42532d79 | |
| parent | 632752506096491785bc85dae3261c2fadb284f9 (diff) | |
| download | openembedded-core-6cad69b4d8b6e626870f4f9ffb91239ab886550d.tar.gz openembedded-core-6cad69b4d8b6e626870f4f9ffb91239ab886550d.tar.bz2 openembedded-core-6cad69b4d8b6e626870f4f9ffb91239ab886550d.zip | |
libusb/libusb0: Drop unneeded custom staging functions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb | 14 | ||||
| -rw-r--r-- | meta/packages/libusb/libusb_0.1.12.bb | 16 |
2 files changed, 2 insertions, 28 deletions
diff --git a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb index 34cc1ac50d..cf6d01279b 100644 --- a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb +++ b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb @@ -15,25 +15,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \ S = "${WORKDIR}/libusb-compat-0.1.0-beta2" -inherit autotools pkgconfig binconfig lib_package +inherit autotools_stage pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}" -do_stage() { - 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? - 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 -} - PACKAGES =+ "libusbpp" FILES_libusbpp = "${libdir}/libusbpp*.so.*" diff --git a/meta/packages/libusb/libusb_0.1.12.bb b/meta/packages/libusb/libusb_0.1.12.bb index 316e67d873..8d34a625b8 100644 --- a/meta/packages/libusb/libusb_0.1.12.bb +++ b/meta/packages/libusb/libusb_0.1.12.bb @@ -8,27 +8,13 @@ PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ file://configure_fix.patch;patch=1" -inherit autotools pkgconfig binconfig lib_package +inherit autotools_stage pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" export CXXFLAGS += "-lstdc++" -do_stage() { - - 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? - 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 - -} - PACKAGES =+ "libusbpp" FILES_libusbpp = "${libdir}/libusbpp*.so.*" |