Re: Debugger in beta3

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / Liblist.pm

diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index cbc8607..ebc5018 100644 (file)
--- a/lib/ExtUtils/Liblist.pm
+++ b/lib/ExtUtils/Liblist.pm
@@ -9,7 +9,14 @@ use File::Basename;
 my $Config_libext = $Config{lib_ext} || ".a";
 
 sub ext {
-    my($potential_libs, $Verbose) = @_;
+    my($self,$potential_libs, $Verbose) = @_;
+    if ($Config{osname} =~ m|^os/?2$|i and $Config{libs}) { 
+       # Dynamic libraries are not transitive, so we may need including
+       # the libraries linked against perl.dll again.
+
+       $potential_libs .= " " if $potential_libs;
+       $potential_libs .= $Config{libs};
+    }
     return ("", "", "", "") unless $potential_libs;
     print STDOUT "Potential libraries are '$potential_libs':\n" if $Verbose;
 
@@ -63,7 +70,7 @@ sub ext {
                # For gcc-2.6.2 on linux (March 1995), DLD can not load
                # .sa libraries, with the exception of libm.sa, so we
                # deliberately skip them.
-           if (@fullname = lsdir($thispth,"^lib$thislib\.$so\.[0-9]+")){
+           if (@fullname = $self->lsdir($thispth,"^lib$thislib\.$so\.[0-9]+")){
                # Take care that libfoo.so.10 wins against libfoo.so.9.
                # Compare two libraries to find the most recent version
                # number.  E.g.  if you have libfoo.so.9.0.7 and
@@ -97,6 +104,17 @@ sub ext {
            } elsif (-f ($fullname="$thispth/lib$thislib$Config_libext")){
            } elsif (-f ($fullname="$thispth/$thislib$Config_libext")){
            } elsif (-f ($fullname="$thispth/Slib$thislib$Config_libext")){
+           } elsif ($Config{'osname'} eq 'dgux'
+                && -l ($fullname="$thispth/lib$thislib$Config_libext")
+                && readlink($fullname) =~ /^elink:/) {
+                # Some of DG's libraries look like misconnected symbolic
+                # links, but development tools can follow them.  (They
+                # look like this:
+                #
+                #    libm.a -> elink:${SDE_PATH:-/usr}/sde/\
+                #    ${TARGET_BINARY_INTERFACE:-m88kdgux}/usr/lib/libm.a
+                #
+                # , the compilation tools expand the environment variables.)
            } else {
                print STDOUT "$thislib not found in $thispth\n" if $Verbose;
                next;
@@ -111,7 +129,7 @@ sub ext {
 
            # what do we know about this library...
            my $is_dyna = ($fullname !~ /\Q$Config_libext\E$/);
-           my $in_perl = ($libs =~ /\B-l${thislib}\b/s);
+           my $in_perl = ($libs =~ /\B-l\Q$ {thislib}\E\b/s);
 
            # Do not add it into the list if it is already linked in
            # with the main perl executable.
@@ -151,19 +169,10 @@ sub ext {
     ("@extralibs", "@bsloadlibs", "@ldloadlibs",join(":",@ld_run_path));
 }
 
-sub lsdir { #yes, duplicate code seems less hassle than having an
-            #extra file with only lsdir
-    my($dir, $regex) = @_;
-    local(*DIR, @ls);
-    opendir(DIR, $dir || ".") or return ();
-    @ls = readdir(DIR);
-    closedir(DIR);
-    @ls = grep(/$regex/, @ls) if $regex;
-    @ls;
-}
-
 1;
+
 __END__
+
 =head1 NAME
 
 ExtUtils::Liblist - determine libraries to use and how to use them