summaryrefslogtreecommitdiff
path: root/packages/perl
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2006-06-19 15:39:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-19 15:39:50 +0000
commitb8014d57e775e2a06dfd5dba67c88fa4fb874c67 (patch)
tree907ef9986813eb5141f963d05f59079aba55d7cc /packages/perl
parent316c1248d81df02fe60d562741f7547756b5c449 (diff)
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.
Diffstat (limited to 'packages/perl')
-rw-r--r--packages/perl/perl.inc4
-rw-r--r--packages/perl/perl_5.8.7.bb4
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index 52418903a2..ac4bfefd32 100644
--- 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 056fee2676..020f190108 100644
--- 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
}