Skip to contentSkip to conversation

libusb1: Cope with ${libdir} and ${base_libdir} being the same

PATCH In review Mike Crowe 2 participants 2 messages Feb 6, 2012 – Feb 8, 2012

lore
Share & tools
lore

Mike Crowe

author
#0 lore raw

PATCH 1/1 libusb1: 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.

Signed-off-by Mike Crowe <[email protected]>
---
 meta/recipes-support/libusb/libusb1_1.0.8.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-support/libusb/libusb1_1.0.8.bb +4 -2
index 8873de7..e45a9d9 100644
@@ -6,7 +6,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"
 

@@ -20,7 +20,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} += "${base_libdir}/*.so.*"
Signature · 1 line
1.7.8.3
#1 lore raw
Quoted 22 lines · Mike Crowe

${libdir} and ${base_libdir} may be the same. If they are don't try and move files onto themselves.

Signed-off-by Mike Crowe<[email protected]>
---
  meta/recipes-support/libusb/libusb1_1.0.8.bb |    6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-support/libusb/libusb1_1.0.8.bb +1 -1
index 8873de7..e45a9d9 100644
@@ -6,7 +6,7 @@ SECTION = "libs"
  LICENSE = "LGPLv2.1+"
  LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-PR = "r2"
+PR = "r3"
 
  SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"

meta/recipes-support/libusb/libusb1_1.0.8.bb EXTRA_OECONF = "--libdir=${base_libdir}" · line 28

Quoted 10 lines
meta/recipes-support/libusb/libusb1_1.0.8.bb +3 -1
@@ -20,7 +20,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} += "${base_libdir}/*.so.*"

Merged all 3 of this series into OE-core

Thanks
Sau!