[libmarpa-r2-perl] 31/32: Packaging
Jonas Smedegaard
dr at jones.dk
Sat Nov 22 18:38:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag Marpa-R2-2.087_000
in repository libmarpa-r2-perl.
commit 7be45dc5e29c2d5f12e9b9d1ad0c6903c08c5f3e
Author: Jeffrey Kegler <JKEGL at cpan.org>
Date: Mon Jul 7 07:11:00 2014 -0700
Packaging
---
cpan/inc/Marpa/R2/Build_Me.pm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/cpan/inc/Marpa/R2/Build_Me.pm b/cpan/inc/Marpa/R2/Build_Me.pm
index c5611c6..f81792f 100644
--- a/cpan/inc/Marpa/R2/Build_Me.pm
+++ b/cpan/inc/Marpa/R2/Build_Me.pm
@@ -847,17 +847,21 @@ sub ACTION_code {
# If it's a shared library, we don't build it here.
if ( not defined $self->args('libmarpa-external') ) {
+
# If the mode file exists, any switch to the internal Libmarpa
# must be made explicitly
if ( not defined $self->args('libmarpa-internal') ) {
my $libmarpa_mode_file =
- File::Spec->catdir( $self->base_dir(), 'core', 'cf', 'LIBMARPA_MODE' );
- die "Libmarpa is external, but you did not explicity specify that -- you need to\n",
- ' If you want to go back to the built-in Libmarpa, ',
- qq{use Build's "--libmarpa-internal=on" flag\n};
- }
+ File::Spec->catdir( $self->base_dir(), 'core', 'cf',
+ 'LIBMARPA_MODE' );
+ die
+ "Libmarpa is external, but you did not explicity specify that -- you need to\n",
+ ' If you want to go back to the built-in Libmarpa, ',
+ qq{use Build's "--libmarpa-internal=on" flag\n}
+ if -e $libmarpa_mode_file;
+ } ## end if ( not defined $self->args('libmarpa-internal') )
$self->do_libmarpa();
- }
+ } ## end if ( not defined $self->args('libmarpa-external') )
return $self->SUPER::ACTION_code;
} ## end sub ACTION_code
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmarpa-r2-perl.git
More information about the Pkg-perl-cvs-commits
mailing list