diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
| commit | b4cb437c6595ff8ac13506e502fe04b1a60c4e04 (patch) | |
| tree | f529de217094f1a49049f90c49d779a49e19cd7c /openembedded/packages/perl | |
| parent | 3baacb49c13a48798d45e30a0a0076ca0b8c9e6a (diff) | |
| download | openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.gz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.bz2 openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.xz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.zip | |
Merge packages changes from OE into poky.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/perl')
| -rw-r--r-- | openembedded/packages/perl/perl-native_5.8.7.bb | 6 | ||||
| -rw-r--r-- | openembedded/packages/perl/perl.inc | 3 | ||||
| -rw-r--r-- | openembedded/packages/perl/perl_5.8.7.bb | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/openembedded/packages/perl/perl-native_5.8.7.bb b/openembedded/packages/perl/perl-native_5.8.7.bb index cc2b7fc5b..170a0ebf8 100644 --- a/openembedded/packages/perl/perl-native_5.8.7.bb +++ b/openembedded/packages/perl/perl-native_5.8.7.bb @@ -2,13 +2,15 @@ DESCRIPTION = "Perl is a popular scripting language." MAINTAINER="David Karlstrom <daka@thg.se>" HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" +PR = "r1" SECTION = "libs" inherit native -DEPENDS = "db3-native gdbm-native" +DEPENDS = "virtual/db-native gdbm-native" -SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz" +SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ + file://Configure-multilib.patch;patch=1" S = "${WORKDIR}/perl-${PV}" #perl is not parallel_make safe diff --git a/openembedded/packages/perl/perl.inc b/openembedded/packages/perl/perl.inc index 12fffa1c3..52418903a 100644 --- a/openembedded/packages/perl/perl.inc +++ b/openembedded/packages/perl/perl.inc @@ -5,7 +5,7 @@ SECTION = "devel" PRIORITY = "optional" DEPENDS = "virtual/db perl-native" -SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://Makefile.patch;patch=1 \ file://config.sh-arm-linux.patch;patch=1 \ file://libperl-5.8.3-create-libperl-soname.patch;patch=1;pnum=0 \ @@ -39,6 +39,7 @@ do_configure() { } do_compile() { + sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL cd Cross oe_runmake perl } diff --git a/openembedded/packages/perl/perl_5.8.7.bb b/openembedded/packages/perl/perl_5.8.7.bb index a960439ad..456cc95c8 100644 --- a/openembedded/packages/perl/perl_5.8.7.bb +++ b/openembedded/packages/perl/perl_5.8.7.bb @@ -6,7 +6,7 @@ SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ file://config.sh-i386-linux" -PR = "r14" +PR = "r15" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl @@ -18,6 +18,8 @@ do_configure() { cp ${WORKDIR}/config.sh-i686-linux . cp ${WORKDIR}/config.sh-i386-linux . cp ${WORKDIR}/config.sh-armeb-linux . + #perl insists on an extra config.sh for arm EABI + cp config.sh-arm-linux config.sh-arm-linux-gnueabi # nslu2 LE uclibc builds do not work with the default config.sh if test "${MACHINE}" = nslu2 then |