From: Hongxu Jia Date: Thu, 7 Nov 2013 02:10:47 +0000 (+0800) Subject: accel-ppp: fix qa issue 'found library in wrong location' while multilib enabled... X-Git-Tag: rev_ivi_2015_02_04~2587 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=686758ae044ebe19ad0d6bc1ca8d20498f1c10fb;p=scm%2Fbb%2Ftizen-distro.git 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 ) ... (From meta-openembedded rev: 63be0ff381350e471ebf318baef6a971bd87fe11) Signed-off-by: Hongxu Jia Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- diff --git a/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb index a7c10f7..dde1f43 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb +++ b/meta-openembedded/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 +}