sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

perl: import parallel build fixes from upstream git tree 

The parallel build issue is fixed in the upstream perl git tree
differently. Replacing our fix with the upstream fix.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
Nitin A Kamble 2011-02-23 13:01:34 -08:00 committed by Saul Wold
parent 0023e32c03
commit 9eb9125de8
6 changed files with 6638 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch
View File

@ -1,18 +0,0 @@
This patch fixes the parallel make issue on a 40 way build system
Nitin A Kamble <nitin.a.kamble@intel.com>
2011-02-16
Index: perl-5.12.2/Makefile.SH
===================================================================
--- perl-5.12.2.orig/Makefile.SH 2010-09-06 16:30:32.000000000 -0700
+++ perl-5.12.2/Makefile.SH 2011-02-16 16:21:30.744143773 -0800
@@ -198,6 +198,8 @@
$this_target: uni.data" ;;
Text/ParseWords) extra_dep="$extra_dep
$this_target: lib/auto/Scalar/Util.$dlext" ;;
+ POSIX) extra_dep="$extra_dep
+$this_target: lib/auto/Cwd/Cwd.$dlext" ;;
esac
done

25
meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch Normal file
View File

@ -0,0 +1,25 @@
Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
2011-02-23
commit 6695a346c41138df5b2c0e26b9a49b1f96137da0
Author: Tony Cook <tony@openbsd32.tony.develop-help.com>
Date: Thu Jul 22 09:54:13 2010 +1000
make_ext.pl populates @INC correctly, don't override it badly
PERL5LIB is populated by make_ext.pl with paths to the modules we need
to run, don't override this with "../../lib" since that may not have
been populated yet in a parallel build.
diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 392b6fb..9e6d091 100644
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,7 +1,3 @@
-# Explicitly avoid including '.' in @INC; autoloader gets confused since it
-# can find POSIX.pm, but can't find autosplit.ix.
-BEGIN { @INC = '../../lib';}
-#
use ExtUtils::MakeMaker;
use ExtUtils::Constant 0.11 'WriteConstants';
use Config;

22
meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch Normal file
View File

@ -0,0 +1,22 @@
Imported from perl git tree by Nitin A Kamble <nitin.a.kamble@intel.com>
2011-02-23
commit 24e93d7838b346d2ed632075f3d824a325170616
Author: Tony Cook <tony@develop-help.com>
Date: Sat Aug 14 00:21:29 2010 +1000
POSIX/t/posix.t expects a certain start to Makefile.PL
6695a346 changed the start of Makefile.PL, but t/posix.t reads that to
test its read() implementation, restore enough of the original for the
test to pass.
diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 9e6d091..292882c 100644
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,3 +1,4 @@
+# Expect this line to be read by t/posix.t, don't change it
use ExtUtils::MakeMaker;
use ExtUtils::Constant 0.11 'WriteConstants';
use Config;

6583
meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

6
meta/recipes-devtools/perl/perl-native_5.12.2.bb
View File

@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "Artistic|GPL"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
PR = "r5"
PR = "r6"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://Configure-multilib.patch;patch=1 \
file://perl-configpm-switch.patch;patch=1 \
file://parallel_build_fix.patch \
file://parallel_build_fix_1.patch \
file://parallel_build_fix_2.patch \
file://parallel_build_fix_3.patch \
file://native-nopacklist.patch;patch=1 \
file://native-perlinc.patch;patch=1"

6
meta/recipes-devtools/perl/perl_5.12.2.bb
View File

@ -8,7 +8,7 @@ PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native-${PV} grep-native"
DEPENDS += "gdbm zlib"
PR = "r1"
PR = "r2"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
@ -18,7 +18,9 @@ PROVIDES += "libmodule-build-perl"
SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://Makefile.patch;patch=1 \
file://parallel_build_fix.patch \
file://parallel_build_fix_1.patch \
file://parallel_build_fix_2.patch \
file://parallel_build_fix_3.patch \
file://Makefile.SH.patch;patch=1 \
file://installperl.patch;patch=1 \
file://perl-dynloader.patch;patch=1 \