Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] libusb1: Cope with ${libdir} and ${base_libdir} being the same
@ 2012-02-06 13:33 Mike Crowe
  2012-02-08  4:06 ` Saul Wold
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Crowe @ 2012-02-06 13:33 UTC (permalink / raw)
  To: openembedded-core; +Cc: 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 <mac@mcrowe.com>
---
 meta/recipes-support/libusb/libusb1_1.0.8.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb
index 8873de7..e45a9d9 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.8.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb
@@ -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.*"
-- 
1.7.8.3




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] libusb1: Cope with ${libdir} and ${base_libdir} being the same
  2012-02-06 13:33 [PATCH] libusb1: Cope with ${libdir} and ${base_libdir} being the same Mike Crowe
@ 2012-02-08  4:06 ` Saul Wold
  0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2012-02-08  4:06 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: Mike Crowe

On 02/06/2012 05:33 AM, Mike Crowe wrote:
> ${libdir} and ${base_libdir} may be the same. If they are don't try and
> move files onto themselves.
>
> Signed-off-by: Mike Crowe<mac@mcrowe.com>
> ---
>   meta/recipes-support/libusb/libusb1_1.0.8.bb |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb
> index 8873de7..e45a9d9 100644
> --- a/meta/recipes-support/libusb/libusb1_1.0.8.bb
> +++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb
> @@ -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.*"


Merged all 3 of this series into OE-core

Thanks
	Sau!



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-02-08  4:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-06 13:33 [PATCH] libusb1: Cope with ${libdir} and ${base_libdir} being the same Mike Crowe
2012-02-08  4:06 ` Saul Wold

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox