perl parallel build fix

PATCH New Nitin A Kamble 1 participant 2 messages Feb 24, 2011

lore

Share & tools

lore

Nitin A Kamble

author

2011-02-24 04:55 UTC #0 lore raw

cover perl parallel build fix

From: Nitin A Kamble <[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: nitin/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Thanks,
Nitin A Kamble <[email protected]>
---

Nitin A Kamble (1):
perl: import parallel build fixes from upstream git tree

 .../perl/perl-5.12.2/parallel_build_fix.patch      |   18 -
 .../perl/perl-5.12.2/parallel_build_fix_1.patch    |   25 +
 .../perl/perl-5.12.2/parallel_build_fix_2.patch    |   22 +
 .../perl/perl-5.12.2/parallel_build_fix_3.patch    | 6583 ++++++++++++++++++++
 meta/recipes-devtools/perl/perl-native_5.12.2.bb   |    6 +-
 meta/recipes-devtools/perl/perl_5.12.2.bb          |    6 +-
 6 files changed, 6638 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch

Signature · 1 line

1.7.2.2

Nitin A Kamble

author

2011-02-24 04:55 UTC #1 lore raw

PATCH 1/1 perl: import parallel build fixes from upstream git tree

From: Nitin A Kamble <[email protected]>

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 <[email protected]>

---
 .../perl/perl-5.12.2/parallel_build_fix.patch      |   18 -
 .../perl/perl-5.12.2/parallel_build_fix_1.patch    |   25 +
 .../perl/perl-5.12.2/parallel_build_fix_2.patch    |   22 +
 .../perl/perl-5.12.2/parallel_build_fix_3.patch    | 6583 ++++++++++++++++++++
 meta/recipes-devtools/perl/perl-native_5.12.2.bb   |    6 +-
 meta/recipes-devtools/perl/perl_5.12.2.bb          |    6 +-
 6 files changed, 6638 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix.patch deleted +0 ~~-18~~

deleted file mode 100644
index 476577e..0000000
@@ -1,18 +0,0 @@
-This patch fixes the parallel make issue on a 40 way build system
-
-Nitin A Kamble <[email protected]>
-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
-

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch new file +25 -0

new file mode 100644
index 0000000..63e6410
@@ -0,0 +1,25 @@
+Imported from perl git tree by Nitin A Kamble <[email protected]>
+2011-02-23
+
+commit 6695a346c41138df5b2c0e26b9a49b1f96137da0
+Author: Tony Cook <[email protected]>
+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;

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch new file +22 -0

new file mode 100644
index 0000000..6c536dd
@@ -0,0 +1,22 @@
+Imported from perl git tree by Nitin A Kamble <[email protected]>
+2011-02-23
+
+commit 24e93d7838b346d2ed632075f3d824a325170616
+Author: Tony Cook <[email protected]>
+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;

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch new file +6583 -0

2,935 lines not on this page · raw message

meta/recipes-devtools/perl/perl-native_5.12.2.bb +4 -2

index 5996494..cd21e9e 100644

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/perl/perl_5.12.2.bb +4 -2

index e659152..18fad18 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.7.2.2

Part of the diff is not shown here. View the raw message.