diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-02-16 16:39:21 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-17 23:19:39 +0000 |
commit | 265bd1ce61e3f7089e919a409e4923fcf062dae5 (patch) | |
tree | ab6d038995e06c808c55e844f238daa817ab64af | |
parent | 27894c58b74fb01530aa7144b8e8c7a2298187b4 (diff) | |
download | poky-265bd1ce61e3f7089e919a409e4923fcf062dae5.tar.gz |
perl-native: fix parallel build
perl native recipe was failing on 40-way system with the parallel build turned
on. With this patch the parallel build on 40 way build system is not failing.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Passed 31 clean/build cycles on the 40-way.
Tested-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.12.2.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.12.2.bb | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch new file mode 100644 index 0000000000..476577eb33 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | This patch fixes the parallel make issue on a 40 way build system | ||
2 | |||
3 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
4 | 2011-02-16 | ||
5 | |||
6 | Index: perl-5.12.2/Makefile.SH | ||
7 | =================================================================== | ||
8 | --- perl-5.12.2.orig/Makefile.SH 2010-09-06 16:30:32.000000000 -0700 | ||
9 | +++ perl-5.12.2/Makefile.SH 2011-02-16 16:21:30.744143773 -0800 | ||
10 | @@ -198,6 +198,8 @@ | ||
11 | $this_target: uni.data" ;; | ||
12 | Text/ParseWords) extra_dep="$extra_dep | ||
13 | $this_target: lib/auto/Scalar/Util.$dlext" ;; | ||
14 | + POSIX) extra_dep="$extra_dep | ||
15 | +$this_target: lib/auto/Cwd/Cwd.$dlext" ;; | ||
16 | esac | ||
17 | done | ||
18 | |||
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.2.bb b/meta/recipes-devtools/perl/perl-native_5.12.2.bb index 790eae2cd5..5996494c98 100644 --- a/meta/recipes-devtools/perl/perl-native_5.12.2.bb +++ b/meta/recipes-devtools/perl/perl-native_5.12.2.bb | |||
@@ -4,7 +4,7 @@ SECTION = "libs" | |||
4 | LICENSE = "Artistic|GPL" | 4 | LICENSE = "Artistic|GPL" |
5 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | 5 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ |
6 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" | 6 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" |
7 | PR = "r4" | 7 | PR = "r5" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | 9 | LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ |
10 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" | 10 | file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" |
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | |||
12 | SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ | 12 | SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ |
13 | file://Configure-multilib.patch;patch=1 \ | 13 | file://Configure-multilib.patch;patch=1 \ |
14 | file://perl-configpm-switch.patch;patch=1 \ | 14 | file://perl-configpm-switch.patch;patch=1 \ |
15 | file://parallel_build_fix.patch \ | ||
15 | file://native-nopacklist.patch;patch=1 \ | 16 | file://native-nopacklist.patch;patch=1 \ |
16 | file://native-perlinc.patch;patch=1" | 17 | file://native-perlinc.patch;patch=1" |
17 | 18 | ||
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb index b27e20f4e3..ce9998601d 100644 --- a/meta/recipes-devtools/perl/perl_5.12.2.bb +++ b/meta/recipes-devtools/perl/perl_5.12.2.bb | |||
@@ -8,7 +8,7 @@ PRIORITY = "optional" | |||
8 | # We need gnugrep (for -I) | 8 | # We need gnugrep (for -I) |
9 | DEPENDS = "virtual/db perl-native-${PV} grep-native" | 9 | DEPENDS = "virtual/db perl-native-${PV} grep-native" |
10 | DEPENDS += "gdbm zlib" | 10 | DEPENDS += "gdbm zlib" |
11 | PR = "r0" | 11 | PR = "r1" |
12 | 12 | ||
13 | # 5.10.1 has Module::Build built-in | 13 | # 5.10.1 has Module::Build built-in |
14 | PROVIDES += "libmodule-build-perl" | 14 | PROVIDES += "libmodule-build-perl" |
@@ -18,6 +18,7 @@ PROVIDES += "libmodule-build-perl" | |||
18 | 18 | ||
19 | SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ | 19 | SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ |
20 | file://Makefile.patch;patch=1 \ | 20 | file://Makefile.patch;patch=1 \ |
21 | file://parallel_build_fix.patch \ | ||
21 | file://Makefile.SH.patch;patch=1 \ | 22 | file://Makefile.SH.patch;patch=1 \ |
22 | file://installperl.patch;patch=1 \ | 23 | file://installperl.patch;patch=1 \ |
23 | file://perl-dynloader.patch;patch=1 \ | 24 | file://perl-dynloader.patch;patch=1 \ |