Re: ExtUtils-Depends 0.300 on Cygwin



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Yaakov (Cygwin Ports) wrote:
| While that would theoretically work, EU:MM still doesn't like it.  I
| tried doing this with EU::D (patch attached, but don't laugh too hard, I
| never claimed to be a Perl hacker), but I got the following instead:

You're right, I could have done better than that.  This is a cleaner
patch, but the results are the same.  Now stop laughing! :-)


Yaakov
Cygwin Ports
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH8au5piWmPGlmQSMRCDoYAJ9TsDomabcRtMsBxCZqTREpoCpKWQCeKK1C
gOfYsCfHRNG0kfZgrFuIbLw=
=Dnu2
-----END PGP SIGNATURE-----
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status 
-x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x 
'*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x 
'*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x 
depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x 
symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x 
gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x 
intltool-merge.in -x intltool-update -x intltool-update.in 
origsrc/ExtUtils-Depends-0.300/lib/ExtUtils/Depends.pm src/ExtUtils-Depends-0.300/lib/ExtUtils/Depends.pm
--- origsrc/ExtUtils-Depends-0.300/lib/ExtUtils/Depends.pm      2008-03-30 10:36:23.000000000 -0500
+++ src/ExtUtils-Depends-0.300/lib/ExtUtils/Depends.pm  2008-03-31 22:24:03.921875000 -0500
@@ -302,7 +302,7 @@
 
        my %mappers = (
                MSWin32 => sub { $_[0] . '.lib' },
-               cygwin  => sub { 'lib' . $_[0] . '.dll.a'},
+               cygwin  => sub { $_[0] . '.dll'},
        );
        my $mapper = $mappers{$^O};
        return () unless defined $mapper;
@@ -313,15 +313,17 @@
                my $lib = $mapper->($stem);
                my $pattern = qr/$lib$/;
 
+               my $matching_dir;
                my $matching_file;
                find (sub {
                        if ((not $matching_file) && /$pattern/) {;
+                               $matching_dir = $File::Find::dir;
                                $matching_file = $File::Find::name;
                        }
                }, map { -d $_ ? ($_) : () } @INC); # only extant dirs
 
                if ($matching_file && -f $matching_file) {
-                       push @found_libs, $matching_file;
+                       push @found_libs, ('-L' . $matching_dir, '-l' . $stem);
                        next;
                }
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]