Date: Tue, 7 Jan 2014 09:58:07 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338990 - in head/lang: perl5.12/files perl5.14/files perl5.16/files Message-ID: <201401070958.s079w7jv039661@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Jan 7 09:58:06 2014 New Revision: 338990 URL: http://svnweb.freebsd.org/changeset/ports/338990 Log: Add the same patch to perl5.1{2,4,6} that perl 5.18, fixing a parallel build issue. Added: head/lang/perl5.12/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 - copied unchanged from r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 head/lang/perl5.14/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 - copied unchanged from r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 head/lang/perl5.16/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 - copied unchanged from r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Copied: head/lang/perl5.12/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 (from r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.12/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Tue Jan 7 09:58:06 2014 (r338990, copy of r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5) @@ -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 + Copied: head/lang/perl5.14/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 (from r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.14/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Tue Jan 7 09:58:06 2014 (r338990, copy of r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5) @@ -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 + Copied: head/lang/perl5.16/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 (from r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.16/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5 Tue Jan 7 09:58:06 2014 (r338990, copy of r338963, head/lang/perl5.18/files/patch-4d106cc5d8fd328d39b1db3c57572dd3dec915b5) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401070958.s079w7jv039661>