r39337 - in /branches/upstream/libextutils-depends-perl/current: .cvsignore Changes MANIFEST MANIFEST.SKIP META.yml Makefile.PL lib/ExtUtils/Depends.pm t/inc/DepTest/libDepTest.dll.a
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Sat Jul 4 18:24:26 UTC 2009
Author: ryan52-guest
Date: Sat Jul 4 18:24:19 2009
New Revision: 39337
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39337
Log:
[svn-upgrade] Integrating new upstream version, libextutils-depends-perl (0.302)
Added:
branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP
branches/upstream/libextutils-depends-perl/current/t/inc/DepTest/libDepTest.dll.a
Removed:
branches/upstream/libextutils-depends-perl/current/.cvsignore
Modified:
branches/upstream/libextutils-depends-perl/current/Changes
branches/upstream/libextutils-depends-perl/current/MANIFEST
branches/upstream/libextutils-depends-perl/current/META.yml
branches/upstream/libextutils-depends-perl/current/Makefile.PL
branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm
Modified: branches/upstream/libextutils-depends-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/Changes?rev=39337&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/Changes (original)
+++ branches/upstream/libextutils-depends-perl/current/Changes Sat Jul 4 18:24:19 2009
@@ -1,4 +1,8 @@
Revision history for Perl extension ExtUtils::Depends.
+
+0.302 Sat Jul 4 15:28:35 CEST 2009
+ - Create import libraries if necessary to fix linking when gcc is used
+ on MSWin32 (Strawberry Perl, for example).
0.301 Sat Sep 6 20:11:01 CEST 2008
- On Cygwin, link directly against the DLLs of dependencies. Patch by
Modified: branches/upstream/libextutils-depends-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/MANIFEST?rev=39337&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/MANIFEST (original)
+++ branches/upstream/libextutils-depends-perl/current/MANIFEST Sat Jul 4 18:24:19 2009
@@ -1,8 +1,8 @@
-.cvsignore
Changes
lib/ExtUtils/Depends.pm
Makefile.PL
MANIFEST
+MANIFEST.SKIP
META.yml
perl-ExtUtils-Depends.spec.in
README
Added: branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP?rev=39337&op=file
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP (added)
+++ branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP Sat Jul 4 18:24:19 2009
@@ -1,0 +1,5 @@
+^blib
+^MAINTAINERS$
+^Makefile$
+^pm_to_blib$
+^\.git
Modified: branches/upstream/libextutils-depends-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/META.yml?rev=39337&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/META.yml (original)
+++ branches/upstream/libextutils-depends-perl/current/META.yml Sat Jul 4 18:24:19 2009
@@ -1,12 +1,32 @@
--- #YAML:1.0
-name: ExtUtils-Depends
-version: 0.301
-abstract: ~
-license: ~
-author: ~
-generated_by: ExtUtils::MakeMaker version 6.44
-distribution_type: module
-requires:
+name: ExtUtils-Depends
+version: 0.302
+abstract: ~
+author: []
+license: perl
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
+ Test::More: 0
+requires:
+ Data::Dumper: 0
+ File::Spec: 0
+ IO::File: 0
+ perl: 5.006
+resources:
+ repository: http://git.gnome.org/cgit/perl-ExtUtils-Depends
+no_index:
+ directory:
+ - t
+ - inc
+ package: ExtUtils::MM
+generated_by: ExtUtils::MakeMaker version 6.52
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+keywords:
+ - XS
+ - XS extensions
+ - dependency
Modified: branches/upstream/libextutils-depends-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/Makefile.PL?rev=39337&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/Makefile.PL (original)
+++ branches/upstream/libextutils-depends-perl/current/Makefile.PL Sat Jul 4 18:24:19 2009
@@ -6,13 +6,34 @@
use ExtUtils::MakeMaker;
WriteMakefile(
- 'dist' => {
- PREOP => 'pod2text lib/ExtUtils/Depends.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
- COMPRESS => 'gzip -9v',
- SUFFIX => '.gz',
- },
- 'NAME' => 'ExtUtils::Depends',
- 'VERSION_FROM' => 'lib/ExtUtils/Depends.pm',
+ dist => {
+ $^O eq 'MSWin32'
+ ? ()
+ : (PREOP => 'pod2text lib/ExtUtils/Depends.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;'),
+ COMPRESS => 'gzip -9v',
+ SUFFIX => '.gz',
+ },
+ NAME => 'ExtUtils::Depends',
+ VERSION_FROM => 'lib/ExtUtils/Depends.pm',
+ PREREQ_PM => {
+ 'File::Spec' => 0,
+ 'Data::Dumper' => 0,
+ 'IO::File' => 0,
+ },
+ MIN_PERL_VERSION => 5.006, #for META.yml
+ META_MERGE => {
+ build_requires => {
+ 'Test::More' => 0,
+ },
+ resources => {
+ repository => 'http://git.gnome.org/cgit/perl-ExtUtils-Depends',
+ },
+ keywords => ['XS', 'XS extensions', 'dependency'],
+ no_index => {
+ package => 'ExtUtils::MM',
+ },
+ },
+ LICENSE => 'perl',
);
use Cwd;
Modified: branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm?rev=39337&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm (original)
+++ branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm Sat Jul 4 18:24:19 2009
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/ExtUtils-Depends/lib/ExtUtils/Depends.pm,v 1.20 2008/09/06 18:13:47 kaffeetisch Exp $
+# $Id$
#
package ExtUtils::Depends;
@@ -11,7 +11,7 @@
use File::Spec;
use Data::Dumper;
-our $VERSION = '0.301';
+our $VERSION = '0.302';
sub import {
my $class = shift;
@@ -282,6 +282,8 @@
TYPEMAPS => [@typemaps],
);
+ $self->build_dll_lib(\%vars) if $^O =~ /MSWin32/;
+
# we don't want to provide these if there is no data in them;
# that way, the caller can still get default behavior out of
# MakeMaker when INC, LIBS and TYPEMAPS are all that are required.
@@ -297,12 +299,19 @@
%vars;
}
+sub build_dll_lib {
+ my ($self, $vars) = @_;
+ $vars->{macro} ||= {};
+ $vars->{macro}{'INST_DYNAMIC_LIB'} =
+ '$(INST_ARCHAUTODIR)/$(BASEEXT)$(LIB_EXT)';
+}
+
sub find_extra_libs {
my $self = shift;
my %mappers = (
- MSWin32 => sub { $_[0] . '.lib' },
- cygwin => sub { $_[0] . '.dll'},
+ MSWin32 => sub { $_[0] . '\.(?:lib|a)' },
+ cygwin => sub { $_[0] . '\.dll'},
);
my $mapper = $mappers{$^O};
return () unless defined $mapper;
@@ -329,6 +338,25 @@
}
return @found_libs;
+}
+
+# Hook into ExtUtils::MakeMaker to create an import library on MSWin32 when gcc
+# is used. FIXME: Ideally, this should be done in EU::MM itself.
+package # wrap to fool the CPAN indexer
+ ExtUtils::MM;
+use Config;
+sub static_lib {
+ my $base = shift->SUPER::static_lib(@_);
+
+ return $base unless $^O =~ /MSWin32/ && $Config{cc} =~ /^gcc/i;
+
+ return <<'__EOM__';
+# This isn't actually a static lib, it just has the same name on Win32.
+$(INST_DYNAMIC_LIB): $(INST_DYNAMIC)
+ dlltool --def $(EXPORT_LIST) --output-lib $@ --dllname $(BASEEXT).$(SO) $(INST_DYNAMIC)
+
+dynamic:: $(INST_DYNAMIC_LIB)
+__EOM__
}
1;
Added: branches/upstream/libextutils-depends-perl/current/t/inc/DepTest/libDepTest.dll.a
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/t/inc/DepTest/libDepTest.dll.a?rev=39337&op=file
==============================================================================
(empty)
More information about the Pkg-perl-cvs-commits
mailing list