From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Date: Thu, 6 Mar 1997 03:08:43 +0000 (-0500)
Subject: OS/2 patches
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eda4d5189d403b15f244b4696a710fb91d15053e;p=p5sagit%2Fp5-mst-13.2.git

OS/2 patches

Chip Salzenberg writes:
>
> Below is a raw list of the changes I've incorporated into my working
> source tree.  I've not broken them down by category yet, or edited
> their titles; they're in chronological order of application.

Here is what I have:

a) Minor fix for hints/os2;
b) 1 taint test minorly broken (does not unset IFS), and should be
switched off on DOSISH systems anyway :-(;
c) One additional word made legal in MakeMaker (It was supported
before, but a warning was issued).

Enjoy,

p5p-msgid: 199703060308.WAA22211@monk.mps.ohio-state.edu
---

diff --git a/hints/os2.sh b/hints/os2.sh
index 9bce2a5..70e478b 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -32,7 +32,9 @@ libemx="`../UU/loc . X c:/emx/lib d:/emx/lib e:/emx/lib f:/emx/lib g:/emx/lib h:
 
 if test "$libemx" = "X"; then echo "Cannot find C library!"; fi
 
-libpth="$libemx/mt $libemx"
+# Acute backslashitis:
+libpth="`echo \"$LIBRARY_PATH\" | tr ';\\\' ' /'`"
+libpth="$libpth $libemx/mt $libemx"
 
 set `emxrev -f emxlibcm`
 emxcrtrev=$5
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 77e4e2b..7145737 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -244,11 +244,11 @@ sub full_setup {
     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
     tool_autosplit
 
-    installpm
-
+    installpm IMPORTS
 	/;
 
     # ^^^ installpm is deprecated, will go about Summer 96
+    # IMPORTS is used under OS/2
 
     # @Overridable is close to @MM_Sections but not identical.  The
     # order is important. Many subroutines declare macros. These
diff --git a/t/op/taint.t b/t/op/taint.t
index 3227718..5758441 100755
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -94,8 +94,9 @@ print "1..96\n";
     test 4, $@ =~ /^Insecure \$ENV{IFS}/, $@;
 
     my ($tmp) = grep { (stat)[2] & 2 } '/tmp', '/var/tmp', '/usr/tmp';
-    if ($tmp) {
+    if ($tmp and $^O ne 'os2') {	# All dirs are writable under OS/2
 	$ENV{PATH} = $tmp;
+	$ENV{IFS} = '';
 	test 5, eval { `$echo 1` } eq '';
 	test 6, $@ =~ /^Insecure directory in \$ENV{PATH}/, $@;
     }