diff options
| author | Ilya Zakharevich <ilya@math.ohio-state.edu> | 1997-06-09 16:52:06 +1200 |
|---|---|---|
| committer | Tim Bunce <Tim.Bunce@ig.co.uk> | 1997-08-07 00:00:00 +1200 |
| commit | 367f3c247e808d76465803ec861b19fd55ffd90d (patch) | |
| tree | 4ca58250b62dedd5b9ff9bae8d8a993b3debb769 /os2/diff.configure | |
| parent | 17fd57d4d5d145d80aa9549b4fb89625b31a4148 (diff) | |
| download | perl-367f3c247e808d76465803ec861b19fd55ffd90d.tar.gz | |
Assorted OS/2 fixes
In article <9706131709.AA05526@toad.ig.co.uk>,
Tim Bunce <Tim.Bunce@ig.co.uk> wrote:
> It give me great pleasure to announce the arrival of perl5.004_01.
Thank you for a great job! You even corrected os2/diff.configure!
Unfortunately, several sections of os2/diff.configure were erroneously
removed, so it will not create a valid config.sh any more (ar used
instead of $ar, and one extra method to extract symbols is not
tried). Unfortunately, I was away from my development machine, so
could not try it earlier.
A patch to correct this problem, and some other ones, follows.
a) Missing sections restored;
os2/diff.configure
b) my_flock added to os2/os2.c (libc contains a dummy
implementation only) (switchable off in case CRT DLL
is fixed in this respect);
os2/os2ish.h os2/Makefile.SHs os2/os2.c
c) depending on architecture, waitpid may be implemented or not.
New define HAS_WAITPID_RUNTIME is added and wait4pid
corrected correspondingly;
os2/os2ish.h util.c
d) if -S was given and the file name contained \ , it was
nevertheless searched on path;
perl.c
e) updated:
os2/Changes README.os2
f) by default use better gcc optimization options (as mbeattie
advices):
hints/os2.sh
[editor's note: this was applied in the reverse order to one a couple
of commits ago]
p5p-msgid: 1997Jun16.163234.2091727@hmivax.humgen.upenn.edu
Diffstat (limited to 'os2/diff.configure')
| -rw-r--r-- | os2/diff.configure | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/os2/diff.configure b/os2/diff.configure index 6d108c7d0d..a649869d2a 100644 --- a/os2/diff.configure +++ b/os2/diff.configure @@ -51,7 +51,16 @@ case "$libs" in '') ;; *) for thislib in $libs; do -@@ -4136,6 +4144,10 @@ +@@ -3968,6 +3976,8 @@ + : + elif try=`./loc $thislib X $libpth`; $test -f "$try"; then + : ++ elif try=`./loc $thislib$lib_ext X $libpth`; $test -f "$try"; then ++ : + elif try=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$try"; then + : + else +@@ -4152,6 +4162,10 @@ eval $xscan;\ $contains '^fprintf$' libc.list >/dev/null 2>&1; then eval $xrun @@ -194,7 +203,31 @@ dflt=`./try` case "$dflt" in [1-4][1-4][1-4][1-4]|12345678|87654321) -@@ -8692,7 +8714,7 @@ +@@ -8707,18 +8731,18 @@ + $cc $ccflags -c bar1.c >/dev/null 2>&1 + $cc $ccflags -c bar2.c >/dev/null 2>&1 + $cc $ccflags -c foo.c >/dev/null 2>&1 +-ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1 ++$ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1 + if $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 && + ./foobar >/dev/null 2>&1; then +- echo "ar appears to generate random libraries itself." ++ echo "$ar appears to generate random libraries itself." + orderlib=false + ranlib=":" +-elif ar ts bar$lib_ext >/dev/null 2>&1 && ++elif $ar ts bar$lib_ext >/dev/null 2>&1 && + $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 && + ./foobar >/dev/null 2>&1; then +- echo "a table of contents needs to be added with 'ar ts'." ++ echo "a table of contents needs to be added with '$ar ts'." + orderlib=false +- ranlib="ar ts" ++ ranlib="$ar ts" + else + case "$ranlib" in + :) ranlib='';; +@@ -8790,7 +8814,7 @@ '') $echo $n ".$c" if $cc $ccflags \ $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \ |