[1/2] lucy-clownfish git commit: Fix Perl build if "." is not in @INC
Repository: lucy-clownfish
Updated Branches:
refs/heads/master e96564cdb -> 15e36c4f7
Fix Perl build if "." is not in @INC
Perl 5.26 doesn't put "." in @INC anymore. Add "." to a localized @INC
when loading Charmony.pm and the binding .pm files.
Fixes CLOWNFISH-119.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/7238ced2
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/7238ced2
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/7238ced2
Branch: refs/heads/master
Commit: 7238ced291cd7e393a7e4ce60995e30bf04a4c03
Parents: e96564c
Author: Nick Wellnhofer
Authored: Fri Nov 24 14:43:28 2017 +0100
Committer: Nick Wellnhofer
Committed: Fri Nov 24 15:17:31 2017 +0100
--
compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 1 +
compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7238ced2/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
--
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index 7d1a506..35c6a2a 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -227,6 +227,7 @@ sub _compile_clownfish {
$hierarchy->read_host_data_json;
# Process all Binding classes in buildlib.
+local @INC = ( @INC, '.' );
my $pm_filepaths = $self->rscan_dir( $BUILDLIB_DIR, qr/\.pm$/ );
for my $pm_filepath (@$pm_filepaths) {
next unless $pm_filepath =~ /Binding/;
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7238ced2/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
--
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
index bcd9d46..f109e94 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
@@ -138,6 +138,7 @@ my $config;
sub charmony {
my ( undef, $key ) = @_;
if (!$config) {
+local @INC = ( @INC, '.' );
eval { require 'Charmony.pm'; };
if ( !$@ ) {
$config = Charmony->config;
[1/2] lucy-clownfish git commit: Fix Perl build if "." is not in @INC
Repository: lucy-clownfish
Updated Branches:
refs/heads/0.6 6555ea20b -> d5a9a6868
Fix Perl build if "." is not in @INC
Perl 5.26 doesn't put "." in @INC anymore. Add "." to a localized @INC
when loading Charmony.pm and the binding .pm files.
Fixes CLOWNFISH-119.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/59d5cac1
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/59d5cac1
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/59d5cac1
Branch: refs/heads/0.6
Commit: 59d5cac1ce71f575d255144895c6860fa22a9895
Parents: 6555ea2
Author: Nick Wellnhofer
Authored: Fri Nov 24 14:43:28 2017 +0100
Committer: Nick Wellnhofer
Committed: Fri Nov 24 14:43:28 2017 +0100
--
compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 1 +
compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/59d5cac1/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
--
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index a4ac266..f4d6971 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -227,6 +227,7 @@ sub _compile_clownfish {
$hierarchy->read_host_data_json;
# Process all Binding classes in buildlib.
+local @INC = ( @INC, '.' );
my $pm_filepaths = $self->rscan_dir( $BUILDLIB_DIR, qr/\.pm$/ );
for my $pm_filepath (@$pm_filepaths) {
next unless $pm_filepath =~ /Binding/;
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/59d5cac1/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
--
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
index 35c0e22..343f768 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
@@ -131,6 +131,7 @@ my $config;
sub charmony {
my ( undef, $key ) = @_;
if (!$config) {
+local @INC = ( @INC, '.' );
eval { require 'Charmony.pm'; };
if ( !$@ ) {
$config = Charmony->config;
[2/2] lucy-clownfish git commit: Disable thread support under Perl 5.8
Disable thread support under Perl 5.8
We got some mysterious CPAN Testers failures with several 5.8 releases
when calling Err_get_error from a thread. Disable thread support under
Perl 5.8, even if 5.8.9 seems to work. (Note that version 5.10.0 has
already been blacklisted.)
http://matrix.cpantesters.org/?dist=Clownfish+0.6.2
http://www.cpantesters.org/cpan/report/4c2e4fd2-cf8c-11e7-b8bd-809199b835e7
http://www.cpantesters.org/cpan/report/a93c273a-cf8c-11e7-b8bd-809199b835e7
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/d5a9a686
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/d5a9a686
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/d5a9a686
Branch: refs/heads/0.6
Commit: d5a9a6868cf241561fc3b3388f5859f2d277d154
Parents: 59d5cac
Author: Nick Wellnhofer
Authored: Fri Nov 24 14:53:11 2017 +0100
Committer: Nick Wellnhofer
Committed: Fri Nov 24 15:03:12 2017 +0100
--
compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d5a9a686/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
--
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
index 343f768..c897376 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
@@ -101,7 +101,9 @@ sub ACTION_charmony {
}
# Perl 5.8.7 added support for CLONE_SKIP.
# Thread support in 5.10.0 seems completely broken (CLOWNFISH-107).
-if ( !$self->config('usethreads') || $^V lt v5.8.7 || $^V eq v5.10.0 ) {
+# We also got some mysterious, thread-related CPAN Testers failures with
+# several 5.8 releases, so disable thread support for 5.10.0 and earlier.
+if ( !$self->config('usethreads') || $^V le v5.10.0 ) {
push @command, '--disable-threads';
}
push @command, (
[2/2] lucy-clownfish git commit: Disable thread support under Perl 5.8
Disable thread support under Perl 5.8
We got some mysterious CPAN Testers failures with several 5.8 releases
when calling Err_get_error from a thread. Disable thread support under
Perl 5.8, even if 5.8.9 seems to work. (Note that version 5.10.0 has
already been blacklisted.)
http://matrix.cpantesters.org/?dist=Clownfish+0.6.2
http://www.cpantesters.org/cpan/report/4c2e4fd2-cf8c-11e7-b8bd-809199b835e7
http://www.cpantesters.org/cpan/report/a93c273a-cf8c-11e7-b8bd-809199b835e7
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/15e36c4f
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/15e36c4f
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/15e36c4f
Branch: refs/heads/master
Commit: 15e36c4f7fddb31db54ff7f1c4eeefe859f910ff
Parents: 7238ced
Author: Nick Wellnhofer
Authored: Fri Nov 24 14:53:11 2017 +0100
Committer: Nick Wellnhofer
Committed: Fri Nov 24 15:17:40 2017 +0100
--
compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/15e36c4f/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
--
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
index f109e94..5bcf4c8 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
@@ -108,7 +108,9 @@ sub ACTION_charmony {
}
# Perl 5.8.7 added support for CLONE_SKIP.
# Thread support in 5.10.0 seems completely broken (CLOWNFISH-107).
-if ( !$self->config('usethreads') || $^V lt v5.8.7 || $^V eq v5.10.0 ) {
+# We also got some mysterious, thread-related CPAN Testers failures with
+# several 5.8 releases, so disable thread support for 5.10.0 and earlier.
+if ( !$self->config('usethreads') || $^V le v5.10.0 ) {
push @command, '--disable-threads';
}
push @command, (
