[oe-commits] Hongxu Jia : accel-ppp: fix qa issue 'found library in wrong location' while multilib enabled on qemux86-64

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 63be0ff381350e471ebf318baef6a971bd87fe11
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=63be0ff381350e471ebf318baef6a971bd87fe11

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Thu Nov  7 10:10:47 2013 +0800

accel-ppp: fix qa issue 'found library in wrong location' while multilib enabled on qemux86-64

While multilib enabled on qemux86-64, accel-ppp-lib should be installed to
'${baselib}/accel-ppp', but the accel-ppp's CMakeLists.txt hardcoded
to install to 'lib/accel-ppp', such as:
...
INSTALL(TARGETS log_file
        LIBRARY DESTINATION lib/accel-ppp
)
...

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb b/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb
index a7c10f7..dde1f43 100644
--- a/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb
+++ b/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb
@@ -30,3 +30,12 @@ PACKAGES =+ "${PN}-libs"
 FILES_${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so"
 INSANE_SKIP_${PN}-libs = "dev-so"
 RDEPENDS_${PN} += "${PN}-libs"
+
+do_install_prepend() {
+    cmlist=`find ${S} -name CMakeLists.txt`
+    for file in $cmlist; do
+        sed -i -e "s:LIBRARY DESTINATION lib/accel-ppp:LIBRARY DESTINATION ${baselib}/accel-ppp:g" \
+               -e "s:\${CMAKE_INSTALL_PREFIX}/lib/accel-ppp:\${CMAKE_INSTALL_PREFIX}/${baselib}/accel-ppp:g" \
+               $cmlist
+    done
+}