[libmarpa-r2-perl] 22/32: Work on shared library support
Jonas Smedegaard
dr at jones.dk
Sat May 17 21:24:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag Marpa-R2-2.085_004
in repository libmarpa-r2-perl.
commit 9a909c27e679570935dc9ea875b886c6379dc15d
Author: Jeffrey Kegler <JKEGL at cpan.org>
Date: Sat Apr 26 09:25:12 2014 -0700
Work on shared library support
---
cpan/.gitignore | 1 +
cpan/Build.PL | 2 +-
cpan/inc/Marpa/R2/Build_Me.pm | 17 ++++++++++++-----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/cpan/.gitignore b/cpan/.gitignore
index 8cace83..f34edd3 100644
--- a/cpan/.gitignore
+++ b/cpan/.gitignore
@@ -12,6 +12,7 @@
/_build/
/blib/
/libmarpa_build/
+/libmarpa_shared/
/libmarpa_dist/
/libmarpa_doc_dist/
/hide/
diff --git a/cpan/Build.PL b/cpan/Build.PL
index 3ae8958..1cdafa6 100644
--- a/cpan/Build.PL
+++ b/cpan/Build.PL
@@ -112,7 +112,7 @@ my @no_index_namespace_inclusive = qw(
my @files_to_cleanup = (
'lib/Marpa/R2/Version.pm', 'pperl/Marpa/R2/Perl/Version.pm',
'lib/Marpa/R2/Installed.pm', 'pperl/Marpa/R2/Perl/Installed.pm',
- 'lib/Marpa/R2.o', 'libmarpa/main/build',
+ 'lib/Marpa/R2.o', 'libmarpa_build', 'libmarpa_shared'
);
my $build = Marpa::R2::Build_Me->new(
diff --git a/cpan/inc/Marpa/R2/Build_Me.pm b/cpan/inc/Marpa/R2/Build_Me.pm
index e4628b1..0272bbf 100644
--- a/cpan/inc/Marpa/R2/Build_Me.pm
+++ b/cpan/inc/Marpa/R2/Build_Me.pm
@@ -278,16 +278,14 @@ sub process_xs {
if not -d $spec->{archdir};
my @extra_linker_flags = ();
- $DB::single = 1;
if ( defined $self->args('libmarpa-shared') ) {
- $DB::single = 1;
die qq{"libmarpa-shared" not supported for Config::AutoConf}
if $Marpa::R2::USE_PERL_AUTOCONF;
my $libmarpa_libs_dir =
- File::Spec->catdir( $self->base_dir(), 'libmarpa_build',
+ File::Spec->catdir( $self->base_dir(), 'libmarpa_shared',
'.libs' );
push @extra_linker_flags, '-L' . $libmarpa_libs_dir;
- my $version_file_name = File::Spec->catfile( $self->base_dir(), 'libmarpa_build', 'VERSION' );
+ my $version_file_name = File::Spec->catfile( $self->base_dir(), 'libmarpa_shared', 'VERSION' );
my $libmarpa_version = $self->file_slurp($version_file_name);
chomp $libmarpa_version;
my @libmarpa_version = split /[.]/xms, $libmarpa_version;
@@ -364,7 +362,13 @@ sub do_libmarpa {
my $base_dir = $self->base_dir();
my $dist_dir = File::Spec->catdir( $base_dir, 'libmarpa_dist' );
- my $build_dir = File::Spec->catdir( $base_dir, 'libmarpa_build' );
+ my $build_dir = File::Spec->catdir(
+ $base_dir,
+ ( defined $self->args('libmarpa-shared')
+ ? 'libmarpa_shared'
+ : 'libmarpa_build'
+ )
+ );
my $build_stamp_file = File::Spec->catfile( $build_dir, 'stamp-h1' );
my $dist_stamp_file = File::Spec->catfile( $dist_dir, 'stamp-h1' );
@@ -487,6 +491,9 @@ sub do_libmarpa {
if ($Marpa::R2::USE_PERL_AUTOCONF) {
+ die qq{"libmarpa-shared" not supported for Config::AutoConf}
+ if defined $self->args('libmarpa-shared');
+
my $libmarpa_version = $self->file_slurp('VERSION');
chomp $libmarpa_version;
my @libmarpa_version = split /[.]/xms, $libmarpa_version;
--
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