r57727 - in /branches/upstream/libmodule-install-xsutil-perl/current: Changes META.yml inc/Module/Install/Repository.pm lib/Module/Install/XSUtil.pm
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sun May 9 07:26:36 UTC 2010
Author: ansgar-guest
Date: Sun May 9 07:25:38 2010
New Revision: 57727
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57727
Log:
[svn-upgrade] Integrating new upstream version, libmodule-install-xsutil-perl (0.23)
Modified:
branches/upstream/libmodule-install-xsutil-perl/current/Changes
branches/upstream/libmodule-install-xsutil-perl/current/META.yml
branches/upstream/libmodule-install-xsutil-perl/current/inc/Module/Install/Repository.pm
branches/upstream/libmodule-install-xsutil-perl/current/lib/Module/Install/XSUtil.pm
Modified: branches/upstream/libmodule-install-xsutil-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-install-xsutil-perl/current/Changes?rev=57727&op=diff
==============================================================================
--- branches/upstream/libmodule-install-xsutil-perl/current/Changes (original)
+++ branches/upstream/libmodule-install-xsutil-perl/current/Changes Sun May 9 07:25:38 2010
@@ -1,4 +1,11 @@
Revision history for Perl extension Module::Install::XSUtil
+
+0.23 Sun May 9 11:15:41 2010
+ - Setup clean_files for gcov output files (*.gcov, *.gcno, *.gcda)
+ - Add cc_libs() for MakeMaker's LIBS option (currently, it is just an
+ ailas to cc_append_libs())
+ - cc_append_libs (and then cc_libs) accepts raw arguments as
+ "cc_libs qw(-L/path/to/libs -lfoo)" (lestrrat++)
0.22 Thu Mar 11 19:02:18 2010
- Add Devel::PPPort to build_requires if needed
Modified: branches/upstream/libmodule-install-xsutil-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-install-xsutil-perl/current/META.yml?rev=57727&op=diff
==============================================================================
--- branches/upstream/libmodule-install-xsutil-perl/current/META.yml (original)
+++ branches/upstream/libmodule-install-xsutil-perl/current/META.yml Sun May 9 07:25:38 2010
@@ -31,4 +31,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: git://github.com/gfx/Perl-Module-Install-XSUtil.git
-version: 0.22
+version: 0.23
Modified: branches/upstream/libmodule-install-xsutil-perl/current/inc/Module/Install/Repository.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-install-xsutil-perl/current/inc/Module/Install/Repository.pm?rev=57727&op=diff
==============================================================================
--- branches/upstream/libmodule-install-xsutil-perl/current/inc/Module/Install/Repository.pm (original)
+++ branches/upstream/libmodule-install-xsutil-perl/current/inc/Module/Install/Repository.pm Sun May 9 07:25:38 2010
@@ -4,7 +4,7 @@
use strict;
use 5.005;
use vars qw($VERSION);
-$VERSION = '0.05';
+$VERSION = '0.06';
use base qw(Module::Install::Base);
Modified: branches/upstream/libmodule-install-xsutil-perl/current/lib/Module/Install/XSUtil.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-install-xsutil-perl/current/lib/Module/Install/XSUtil.pm?rev=57727&op=diff
==============================================================================
--- branches/upstream/libmodule-install-xsutil-perl/current/lib/Module/Install/XSUtil.pm (original)
+++ branches/upstream/libmodule-install-xsutil-perl/current/lib/Module/Install/XSUtil.pm Sun May 9 07:25:38 2010
@@ -2,7 +2,7 @@
use 5.005_03;
-$VERSION = '0.22';
+$VERSION = '0.23';
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
@@ -55,6 +55,7 @@
$self->makemaker_args->{OBJECT} = '$(O_FILES)';
$self->clean_files('$(O_FILES)');
+ $self->clean_files('*.stackdump') if $^O eq 'cygwin';
if($self->_xs_debugging()){
# override $Config{optimize}
@@ -162,7 +163,6 @@
return;
}
-
sub cc_append_to_inc{
my($self, @dirs) = @_;
@@ -189,6 +189,11 @@
return;
}
+
+sub cc_libs {
+ goto &cc_append_to_libs;
+}
+
sub cc_append_to_libs{
my($self, @libs) = @_;
@@ -198,10 +203,16 @@
my $libs = join q{ }, map{
my($name, $dir) = ref($_) eq 'ARRAY' ? @{$_} : ($_, undef);
-
- $dir = qq{-L$dir } if defined $dir;
- _verbose "libs: $dir-l$name" if _VERBOSE;
- $dir . qq{-l$name};
+ my $lib;
+ if(defined $dir) {
+ $lib = ($dir =~ /^-/ ? qq{$dir } : qq{-L$dir });
+ }
+ else {
+ $lib = '';
+ }
+ $lib .= ($name =~ /^-/ ? qq{$name } : qq{-l$name});
+ _verbose "libs: $lib" if _VERBOSE;
+ $lib;
} @libs;
if($mm->{LIBS}){
@@ -210,8 +221,7 @@
else{
$mm->{LIBS} = $libs;
}
-
- return;
+ return $libs;
}
sub cc_append_to_ccflags{
@@ -330,6 +340,11 @@
push @{$C_ref}, $c unless grep{ $_ eq $c } @{$C_ref};
}
+ $self->clean_files(map{
+ File::Spec->catfile($_, '*.gcov'),
+ File::Spec->catfile($_, '*.gcda'),
+ File::Spec->catfile($_, '*.gcno'),
+ } @dirs);
$self->cc_append_to_inc('.');
return;
@@ -389,7 +404,10 @@
$ToInstall{$path} = File::Spec->join('$(INST_ARCHAUTODIR)', $ident);
_verbose "install: $path as $ident" if _VERBOSE;
- $self->_extract_functions_from_header_file($path);
+ my @funcs = $self->_extract_functions_from_header_file($path);
+ if(@funcs){
+ $self->cc_append_to_funclist(@funcs);
+ }
}
if(@not_found){
@@ -472,11 +490,7 @@
}
}
- if(@functions){
- $self->cc_append_to_funclist(@functions);
- }
-
- return;
+ return @functions;
}
@@ -537,7 +551,7 @@
=head1 VERSION
-This document describes Module::Install::XSUtil version 0.22.
+This document describes Module::Install::XSUtil version 0.23.
=head1 SYNOPSIS
@@ -615,6 +629,17 @@
Sets include paths for a C compiler.
+=head2 cc_libs @libs
+
+Sets C<MakeMaker>'s C<LIBS>. If a name starts C<->, it will be interpreted as is.
+Otherwise prefixed C<-l>.
+
+e.g.:
+
+ cc_libs -lfoo;
+ cc_libs 'foo'; # ditto.
+ cc_libs qw(-L/path/to/libs foo bar); # with library paths
+
=head2 install_headers ?@header_files
Declares providing header files, extracts functions from these header files,
More information about the Pkg-perl-cvs-commits
mailing list