From 017f9dbb6b05db364e9e930f5e30b02f2053e00b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Aug 2006 22:19:53 +0000 Subject: perl/perl-native: Sync with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@618 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/perl/perl.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/packages/perl/perl.inc') diff --git a/meta/packages/perl/perl.inc b/meta/packages/perl/perl.inc index 52418903a2..a9a3d6b655 100644 --- a/meta/packages/perl/perl.inc +++ b/meta/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 ) } @@ -65,9 +67,9 @@ python populate_packages_prepend () { do_split_packages(d, libdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True) } -PACKAGES = "perl perl-misc perl-lib perl-dev perl-pod" +PACKAGES = "perl-dbg perl perl-misc perl-lib perl-dev perl-pod" FILES_${PN} = "/usr/bin/perl /usr/bin/perl${PV}" FILES_${PN}-lib = "/usr/lib/libperl.so*" FILES_${PN}-dev = "/usr/lib/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/" FILES_${PN}-pod = "/usr/lib/perl5/${PV}/pod" -FILES_perl-misc = "/usr/bin/" +FILES_perl-misc = "/usr/bin/*" -- cgit v1.2.3