perl 5.8.7: Allow perl to be built without the perl shared library. This is

to enable building on sh3/sh4 where toolchain issues prevent this from
working. The changes check the perl config.sh for useshrplib to determine if
the shared library is being made before doing things with it during install.

diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index 52418903a2f19ac393f4103ef1bd92867ae8f99e..ac4bfefd32964d4388b32b66621545353e985b55 100644 (file)
--- a/packages/perl/perl.inc
+++ b/packages/perl/perl.inc
@@ -46,7 +46,9 @@ do_compile() {
 
 do_install() {
        oe_runmake install
-       mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
+       # Make sure the shared library is configured before trying to move it
+       grep -q "useshrplib='false'" ${S}/config.sh ||
+               mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
        ( cd ${D}/usr/bin/; rm perl; ln -s perl${PV} perl )
 }
 

diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 056fee267663bac9519b38391a288cb21233e368..020f1901083b1bec871941c288a9e57244a11de4 100644 (file)
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -53,7 +53,9 @@ do_configure() {
 }
 
 do_install_append() {
-       ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
+       # Make sure the shared library is configured before trying to symlink it
+       grep -q "useshrplib='false'" ${S}/config.sh ||
+               ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
        sed -i -e "s,${D},,g" ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/Config_heavy.pl
 }