From: Mingli Yu <[email protected]>

Update $(base_libdir) to $(baselib) to fix
the below do_install error when usrmerge
enabled in DISTRO_FEATURES.

| if [ ! -d 
/poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64
 ]; then mkdir
/poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64;
 fi
| mkdir: cannot create directory 
/poky-build/tmp-glibc/work/core2-64-wrs-linux/lmbench/3.0-a9-r2/image/usr/usr/lib64
 No such file or directory
| Makefile:141: recipe for target 'install-target' failed
| make[1]: *** [install-target] Error 1

Signed-off-by: Mingli Yu <[email protected]>
---
 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb 
b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index 593b62f..c78e7a8 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -51,8 +51,13 @@ do_compile () {
     install -d ${S}/bin/${TARGET_SYS}
     oe_runmake -C src
 }
+export baselib
 
 do_install () {
+    # fix the lib path when usrmerge enabled
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', 
d)}; then
+        sed -i -e "s;\$(BASE)\$(base_libdir);\$(BASE)/\$(baselib);g" 
${S}/src/Makefile
+    fi
     install -d ${D}${sysconfdir}/default/volatiles \
            ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \
            ${D}${datadir}/lmbench/scripts
-- 
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Reply via email to