Undo io_linenum.t part of #34148. It was io_multihomed.t that I meant

[p5sagit/p5-mst-13.2.git] / ext / SDBM_File / Makefile.PL

diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
index bff3e7b..1267efc 100644 (file)
--- a/ext/SDBM_File/Makefile.PL
+++ b/ext/SDBM_File/Makefile.PL
@@ -1,13 +1,17 @@
 use ExtUtils::MakeMaker;
-use Config;\r
+use Config;
 
 # The existence of the ./sdbm/Makefile.PL file causes MakeMaker
 # to automatically include Makefile code for the targets
 #      config, all, clean, realclean and sdbm/Makefile
 # which perform the corresponding actions in the subdirectory.
 
+# Work around: Darwin ppc64 bug ignores archive contents when building bundles
+
 $define = ($^O eq 'MSWin32') ? '-DMSDOS' : '';
 if ($^O eq 'MSWin32') { $myextlib = 'sdbm\\libsdbm$(LIB_EXT)'; }
+elsif ($^O eq 'darwin' && $Config{'ldflags'} =~/-arch ppc64/) {
+                        $myextlib = '-all_load sdbm/libsdbm$(LIB_EXT)'; }
 else                  { $myextlib = 'sdbm/libsdbm$(LIB_EXT)';  }
 
 WriteMakefile(
@@ -21,27 +25,27 @@ WriteMakefile(
              );
 
 sub MY::postamble {
-  if ($^O =~ /MSWin32/ && Win32::IsWin95()) {
-       if ($Config{'make'} =~ /dmake/i) {\r
-           # dmake-specific\r
-           return <<EOT;\r
+  if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
+       if ($Config{'make'} =~ /dmake/i) {
+           # dmake-specific
+           return <<'EOT';
 $(MYEXTLIB): sdbm/Makefile
 @[
        cd sdbm
        $(MAKE) all
        cd ..
 ]
-EOT\r
-       } elsif ($Config{'make'} =~ /nmake/i) {\r
-           #\r
-           return <<'EOT';\r
-$(MYEXTLIB): sdbm/Makefile\r
-       cd sdbm\r
-       $(MAKE) all\r
-       cd ..\r
-EOT\r
-       } \r
-  } elsif ($^O ne 'VMS') {\r
+EOT
+       } elsif ($Config{'make'} =~ /nmake/i) {
+           #
+           return <<'EOT';
+$(MYEXTLIB): sdbm/Makefile
+       cd sdbm
+       $(MAKE) all
+       cd ..
+EOT
+       } 
+} elsif ($^O ne 'VMS') {
     '
 $(MYEXTLIB): sdbm/Makefile
        cd sdbm && $(MAKE) all