diff options
Diffstat (limited to 'packages/perl')
| -rw-r--r-- | packages/perl/perl-5.8.8/Makefile.patch | 30 | ||||
| -rw-r--r-- | packages/perl/perl-5.8.8/installperl.patch | 15 | ||||
| -rw-r--r-- | packages/perl/perl_5.8.8.bb | 10 |
3 files changed, 46 insertions, 9 deletions
diff --git a/packages/perl/perl-5.8.8/Makefile.patch b/packages/perl/perl-5.8.8/Makefile.patch index c78a39b178..cf5cca19a0 100644 --- a/packages/perl/perl-5.8.8/Makefile.patch +++ b/packages/perl/perl-5.8.8/Makefile.patch @@ -1,5 +1,7 @@ ---- perl-5.8.8/Cross/Makefile 2007/04/06 00:47:46 1.1 -+++ perl-5.8.8/Cross/Makefile 2007/04/06 00:48:04 +Index: perl-5.8.8/Cross/Makefile +=================================================================== +--- perl-5.8.8.orig/Cross/Makefile 2004-01-13 07:44:01.000000000 +1100 ++++ perl-5.8.8/Cross/Makefile 2007-06-14 12:40:44.000000000 +1000 @@ -12,7 +12,7 @@ export CC = $(CROSS)gcc @@ -9,7 +11,29 @@ export STRIP = $(CROSS)strip export AR = $(CROSS)ar export RANLIB = $(CROSS)ranlib -@@ -58,11 +58,11 @@ +@@ -34,21 +34,6 @@ + all: + @echo Please read the README file before doing anything else. + +-gen_patch: +- diff -Bbur ../Makefile.SH Makefile.SH > Makefile.SH.patch +- diff -Bbur ../installperl installperl > installperl.patch +- +-patch: +- cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \ +- patch -p1 < Cross/Makefile.SH.patch; \ +- patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \ +- sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \ +- touch CROSS_PATCHED ; fi +- +-dry_patch: +- cd .. ; patch --dry-run -p1 < Cross/Makefile.SH.patch; \ +- patch --dry-run -p1 < Cross/installperl.patch; \ +- + perl: + @echo Perl cross-build directory is $(TOPDIR) + @echo Target arch is $(SYS) +@@ -58,11 +43,11 @@ $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library diff --git a/packages/perl/perl-5.8.8/installperl.patch b/packages/perl/perl-5.8.8/installperl.patch new file mode 100644 index 0000000000..ff52bc3a9c --- /dev/null +++ b/packages/perl/perl-5.8.8/installperl.patch @@ -0,0 +1,15 @@ +Index: perl-5.8.8/installperl +=================================================================== +--- perl-5.8.8.orig/installperl 2007-06-14 12:36:23.000000000 +1000 ++++ perl-5.8.8/installperl 2007-06-14 12:38:39.000000000 +1000 +@@ -3,8 +3,8 @@ + BEGIN { + require 5.004; + chdir '..' if !-d 'lib' and -d '../lib'; +- @INC = 'lib'; +- $ENV{PERL5LIB} = 'lib'; ++# @INC = 'lib'; ++# $ENV{PERL5LIB} = 'lib'; + } + + use strict; diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 603280b423..93b7c8ddd8 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -5,14 +5,15 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r21" +PR = "r22" # Major part of version PVM = "5.8" SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://Makefile.patch;patch=1 \ - file://Makefile.SH.patch \ + file://Makefile.SH.patch;patch=1 \ + file://installperl.patch;patch=1 \ file://perl-dynloader.patch;patch=1 \ file://perl-moreconfig.patch;patch=1 \ file://letgcc-find-errno.patch;patch=1 \ @@ -44,9 +45,8 @@ do_configure() { # Make hostperl in build directory be the native perl cp -f ${HOSTPERL} hostperl - # This is silly - should just patch Makefile.SH directly + # Do out work in the cross subdir cd Cross - cp -f ${WORKDIR}/Makefile.SH.patch . # Generate configuration rm -f config.sh-${TARGET_ARCH}-${TARGET_OS} @@ -88,8 +88,6 @@ do_configure() { rm -f config echo "ARCH = ${TARGET_ARCH}" > config echo "OS = ${TARGET_OS}" >> config - - oe_runmake patch } do_compile() { if test "${MACHINE}" != "native"; then |