Skip to contentSkip to conversation

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

PATCH New Hongxu Jia 1 participant 2 messages Nov 7, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

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

The following changes since commit ffb5434823195cbdc41c76a110eaa6ae04e2b010:

dnsmasq: uprev to 2.6.3 (2013-11-06 15:12:45 -0500)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-accel-ppp
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-accel-ppp

Hongxu Jia (1):
accel-ppp: fix qa issue 'found library in wrong location' while
multilib enabled on qemux86-64

 meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
Signature · 1 line
1.8.1.2
author
#1 lore raw

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

---
 meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb +9 -0
index a7c10f7..dde1f43 100644
@@ -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
+}
Signature · 1 line
1.8.1.2