From 38156d3b6c2372933ff6d290cba23eb6fc288000 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 5 Apr 2007 06:29:53 +0000 Subject: [PATCH] perl: Rearrange the patches/files a bit. Move the 5.8.4 specific patches out of the common directory and only specify common files in the SRC_URI in perl.inc, move the others to the version specific .bb's. --- packages/perl/perl-5.8.4/.mtn2git_empty | 0 packages/perl/{files => perl-5.8.4}/Makefile.SH.patch | 0 packages/perl/{files => perl-5.8.4}/Makefile.patch | 0 .../perl/{files => perl-5.8.4}/config.sh-arm-linux.patch | 0 packages/perl/{files => perl-5.8.4}/config.sh-i686-linux | 0 packages/perl/{files => perl-5.8.4}/config.sh-mipsel-linux | 0 packages/perl/{files => perl-5.8.4}/uclibc.patch | 0 packages/perl/perl.inc | 5 +---- packages/perl/perl_5.8.4.bb | 4 ++++ packages/perl/perl_5.8.7.bb | 1 + 10 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 packages/perl/perl-5.8.4/.mtn2git_empty rename packages/perl/{files => perl-5.8.4}/Makefile.SH.patch (100%) rename packages/perl/{files => perl-5.8.4}/Makefile.patch (100%) rename packages/perl/{files => perl-5.8.4}/config.sh-arm-linux.patch (100%) rename packages/perl/{files => perl-5.8.4}/config.sh-i686-linux (100%) rename packages/perl/{files => perl-5.8.4}/config.sh-mipsel-linux (100%) rename packages/perl/{files => perl-5.8.4}/uclibc.patch (100%) diff --git a/packages/perl/perl-5.8.4/.mtn2git_empty b/packages/perl/perl-5.8.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/perl/files/Makefile.SH.patch b/packages/perl/perl-5.8.4/Makefile.SH.patch similarity index 100% rename from packages/perl/files/Makefile.SH.patch rename to packages/perl/perl-5.8.4/Makefile.SH.patch diff --git a/packages/perl/files/Makefile.patch b/packages/perl/perl-5.8.4/Makefile.patch similarity index 100% rename from packages/perl/files/Makefile.patch rename to packages/perl/perl-5.8.4/Makefile.patch diff --git a/packages/perl/files/config.sh-arm-linux.patch b/packages/perl/perl-5.8.4/config.sh-arm-linux.patch similarity index 100% rename from packages/perl/files/config.sh-arm-linux.patch rename to packages/perl/perl-5.8.4/config.sh-arm-linux.patch diff --git a/packages/perl/files/config.sh-i686-linux b/packages/perl/perl-5.8.4/config.sh-i686-linux similarity index 100% rename from packages/perl/files/config.sh-i686-linux rename to packages/perl/perl-5.8.4/config.sh-i686-linux diff --git a/packages/perl/files/config.sh-mipsel-linux b/packages/perl/perl-5.8.4/config.sh-mipsel-linux similarity index 100% rename from packages/perl/files/config.sh-mipsel-linux rename to packages/perl/perl-5.8.4/config.sh-mipsel-linux diff --git a/packages/perl/files/uclibc.patch b/packages/perl/perl-5.8.4/uclibc.patch similarity index 100% rename from packages/perl/files/uclibc.patch rename to packages/perl/perl-5.8.4/uclibc.patch diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index 64e548a121..3e5ac504cd 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -9,10 +9,7 @@ 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 \ - file://uclibc.patch;patch=1 \ - file://Makefile.SH.patch \ - file://config.sh-mipsel-linux \ - file://config.sh-i686-linux" + file://Makefile.SH.patch" HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}" diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb index 7509f1b66b..085182bb50 100644 --- a/packages/perl/perl_5.8.4.bb +++ b/packages/perl/perl_5.8.4.bb @@ -1,3 +1,7 @@ require perl.inc PR = "r5" + +SRC_URI += "file://uclibc.patch;patch=1 \ + file://config.sh-mipsel-linux \ + file://config.sh-i686-linux" diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 12aec88a02..69b5784f38 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -7,6 +7,7 @@ require perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ file://config.sh-powerpc-linux \ + file://config.sh-mipsel-linux \ file://config.sh-i386-linux \ file://config.sh-i486-linux \ file://config.sh-i586-linux \ -- 2.39.5