kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add the same patch to perl5.1{2,4,6} that perl 5.18, fixing a parallel build issue.

Browse source
This commit is contained in:
Mathieu Arnold 2014-01-07 09:58:06 +00:00
parent fe8682b27c
commit b087c41e1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=338990
3 changed files with 102 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lang/perl5.12/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Normal file
View file

@ -0,0 +1,34 @@
From 4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 22 Aug 2013 11:48:29 +0200
Subject: [PATCH] For SDBM_File, stop EU::MM from generating its default
subdirs rule.
The default subdirs rule creates a race condition with the rule that
Makefile.PL explicitly adds to generate libsdbm.a, which can cause parallel
makes to fail.
---
ext/SDBM_File/Makefile.PL | 6 ++++++
pod/perldelta.pod | 11 ++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git ext/SDBM_File/Makefile.PL ext/SDBM_File/Makefile.PL
index fa16a79..b96b80b 100644
--- ext/SDBM_File/Makefile.PL
+++ ext/SDBM_File/Makefile.PL
@@ -23,6 +23,12 @@ WriteMakefile(
PERL_MALLOC_OK => 1,
);
+# We don't want the default subdir rule, as it creates a race condition with the
+# rule we add below.
+sub MY::subdir_x {
+ return '';
+}
+
sub MY::postamble {
if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
if ($Config{'make'} =~ /dmake/i) {
--
1.8.2.1

34
lang/perl5.14/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Normal file
View file

@ -0,0 +1,34 @@
From 4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 22 Aug 2013 11:48:29 +0200
Subject: [PATCH] For SDBM_File, stop EU::MM from generating its default
subdirs rule.
The default subdirs rule creates a race condition with the rule that
Makefile.PL explicitly adds to generate libsdbm.a, which can cause parallel
makes to fail.
---
ext/SDBM_File/Makefile.PL | 6 ++++++
pod/perldelta.pod | 11 ++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git ext/SDBM_File/Makefile.PL ext/SDBM_File/Makefile.PL
index fa16a79..b96b80b 100644
--- ext/SDBM_File/Makefile.PL
+++ ext/SDBM_File/Makefile.PL
@@ -23,6 +23,12 @@ WriteMakefile(
PERL_MALLOC_OK => 1,
);
+# We don't want the default subdir rule, as it creates a race condition with the
+# rule we add below.
+sub MY::subdir_x {
+ return '';
+}
+
sub MY::postamble {
if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
if ($Config{'make'} =~ /dmake/i) {
--
1.8.2.1

34
lang/perl5.16/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Normal file
View file

@ -0,0 +1,34 @@
From 4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 22 Aug 2013 11:48:29 +0200
Subject: [PATCH] For SDBM_File, stop EU::MM from generating its default
subdirs rule.
The default subdirs rule creates a race condition with the rule that
Makefile.PL explicitly adds to generate libsdbm.a, which can cause parallel
makes to fail.
---
ext/SDBM_File/Makefile.PL | 6 ++++++
pod/perldelta.pod | 11 ++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git ext/SDBM_File/Makefile.PL ext/SDBM_File/Makefile.PL
index fa16a79..b96b80b 100644
--- ext/SDBM_File/Makefile.PL
+++ ext/SDBM_File/Makefile.PL
@@ -23,6 +23,12 @@ WriteMakefile(
PERL_MALLOC_OK => 1,
);
+# We don't want the default subdir rule, as it creates a race condition with the
+# rule we add below.
+sub MY::subdir_x {
+ return '';
+}
+
sub MY::postamble {
if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
if ($Config{'make'} =~ /dmake/i) {
--
1.8.2.1