From f9f1a63e03d11028785cc4beeb19041b15f8dcb0 Mon Sep 17 00:00:00 2001
From: Olivia Yin <hong-hua.yin@freescale.com>
Date: Tue, 7 May 2013 07:26:47 +0000
Subject: [PATCH] lvm2: add configure option --with-usrlibdir to install shared
 library in 64-bit systems

According to make.tmpl.in, shared lib will be installed under $(usrlibdir)
install_lib_shared: $(LIB_SHARED)
        $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
        $(INSTALL_DIR) $(usrlibdir)
        $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)

But default $(usrlibdir) is $(DESTDIR)${prefix}/lib no matter it is 32-bit or 64-bit system.
So we need align $(usrlibdir) with $(libdir).

Signed-off-by: Olivia Yin <hong-hua.yin@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/lvm2/lvm2.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 157e11b924..5de1e3f7fd 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -4,7 +4,7 @@ DEPENDS = "udev"
 LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
-INC_PR = "r0"
+INC_PR = "r1"
 
 
 S = "${WORKDIR}/LVM2.${PV}"
@@ -37,3 +37,4 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev"
 FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
 
+EXTRA_OECONF = "--with-usrlibdir=${libdir}"