]> code.ossystems Code Review - openembedded-core.git/commitdiff
perl: fix installation failure because of shell issue
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 11 Dec 2020 14:28:18 +0000 (17:28 +0300)
committerSteve Sakoman <steve@sakoman.com>
Mon, 4 Jan 2021 14:50:23 +0000 (04:50 -1000)
On one of my buildservers I noticed perl do_install failing with the
following message:

| rm: cannot remove '<OEROOT>/tmp-rpb-glibc/work/armv8-2a-linaro-linux/perl/5.32.0-r0/image//usr/lib/perl5/5.32.0/*/CORE/libperl.so': No such file or directory

I tracked this down to shell being dash rather than bash not being able
to expand this glob in the middle of the filename. So replace the glob
expansion with the simpler one which works in all cases.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d1ea1b5c12120abdd085dc4eb69120af9258a99b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-devtools/perl/perl_5.30.1.bb

index b53aff12160e5bcc796b8931e4c384858d8e5fc4..ee6eb6ef0f019ba582ee8937f65090ed1545077a 100644 (file)
@@ -146,8 +146,9 @@ do_install() {
     install lib/ExtUtils/typemap ${D}${libdir}/perl5/${PV}/ExtUtils/
 
     # Fix up shared library
-    rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
-    ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
+    dir=$(echo ${D}/${libdir}/perl5/${PV}/*/CORE)
+    rm $dir/libperl.so
+    ln -sf ../../../../libperl.so.${PERL_LIB_VER} $dir/libperl.so
 }
 
 do_install_append_class-target() {