[oe-commits] Mike Crowe : libusb-compat: Cope with ${libdir} and ${base_libdir} being the same
git at git.openembedded.org
git at git.openembedded.org
Wed Feb 8 00:50:04 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: eadcd9708a2b363295b3b8a9159972ca4100fc51
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=eadcd9708a2b363295b3b8a9159972ca4100fc51
Author: Mike Crowe <mac at mcrowe.com>
Date: Mon Feb 6 13:42:36 2012 +0000
libusb-compat: Cope with ${libdir} and ${base_libdir} being the same
${libdir} and ${base_libdir} may be the same. If they are don't try and
move files onto themselves.
---
meta/recipes-support/libusb/libusb-compat_0.1.3.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
index 60ebcc2..1595a29 100644
--- a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
@@ -15,7 +15,7 @@ DEPENDS = "libusb1"
PROVIDES = "libusb"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
file://0.1.0-beta1-gcc3.4-fix.patch"
@@ -29,7 +29,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}"
do_install_append() {
install -d ${D}${libdir}
- mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+ mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ fi
}
FILES_${PN}-dev += "${base_libdir}/*.so"
More information about the Openembedded-commits
mailing list