]> code.ossystems Code Review - openembedded-core.git/commitdiff
perl: Don't use TARGET_ARCH in filepaths
authorWilliam A. Kennington III via Openembedded-core <openembedded-core@lists.openembedded.org>
Tue, 2 Apr 2019 21:53:47 +0000 (14:53 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 3 Apr 2019 13:46:57 +0000 (14:46 +0100)
Platforms like powerpc64le have different variants of the same target.
Perl guesses that the target should be called powerpc64le-linux, while
TARGET_ARCH think it is called ppc64le-linux. If we use TARGET_ARCH
for perl-native on powerpc64le this build will fail since the
post-install rm command won't reference and existing file.

We know that there is only one arch existing per build, so use a
wildcard for finding the path instead of trying to guess the correct
architecture name.

Signed-off-by: William A. Kennington III <wak@google.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/perl-sanity/perl_5.28.1.bb

index 5aa7cd3ee164b3b0d9cb90555b1ad826e4daf4f4..f3948a5f8d449f56c3b1393407cf058b480d3536 100644 (file)
@@ -107,8 +107,8 @@ do_install() {
     install lib/ExtUtils/typemap ${D}${libdir}/perl5/${PV}/ExtUtils/
 
     # Fix up shared library
-    rm ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/libperl.so
-    ln -sf ../../../../libperl.so.${PERL_LIB_VER} ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/libperl.so
+    rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
+    ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo ${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
 }
 
 do_install_append_class-target() {