Detypo.

[p5sagit/p5-mst-13.2.git] / hints / os2.sh

diff --git a/hints/os2.sh b/hints/os2.sh
index fe0c2d3..eb11ff5 100644 (file)
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -93,8 +93,10 @@ if test "$libemx" = "X"; then echo "Cannot find C library!" >&2; fi
 libpth="`echo \"$LIBRARY_PATH\" | tr ';\\\' ' /'`"
 libpth="$libpth $libemx/mt $libemx"
 
-set `emxrev -f emxlibcm`
+set `cmd /c emxrev -f emxlibcm`
 emxcrtrev=$5
+# indented to not put it into config.sh
+  _defemxcrtrev=-D_EMX_CRT_REV_=$emxcrtrev
 
 so='dll'
 
@@ -106,6 +108,10 @@ exe_ext='.exe'
 # We provide it
 i_dlfcn='define'
 
+# -Zomf build has a problem with _exit() *flushing*, so the test
+# gets confused:
+fflushNULL="define"
+
 aout_d_shrplib='undef'
 aout_useshrplib='false'
 aout_obj_ext='.o'
@@ -124,11 +130,13 @@ fi
 aout_ldflags="$aout_ldflags"
 
 aout_d_fork='define'
-aout_ccflags='-DPERL_CORE -DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I.'
-aout_cppflags='-DPERL_CORE -DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I.'
+aout_ccflags="-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I. $_defemxcrtrev"
+aout_cppflags="-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I. $_defemxcrtrev"
 aout_use_clib='c'
 aout_usedl='undef'
 aout_archobjs="os2.o dl_os2.o"
+# Not listed in dynamic_ext, but needed for AOUT static_ext nevertheless
+aout_extra_static_ext="OS2::DLL"
 
 # variable which have different values for aout compile
 used_aout='d_shrplib useshrplib plibext lib_ext obj_ext ar plibext d_fork lddlflags ldflags ccflags use_clib usedl archobjs cppflags'
@@ -165,9 +173,9 @@ else
     # Recursive regmatch may eat 2.5M of stack alone.
     ldflags='-Zexe -Zomf -Zmt -Zcrtdll -Zstack 32000'
     if [ $emxcrtrev -ge 50 ]; then 
-       ccflags='-Zomf -Zmt -DDOSISH -DOS2=2 -DEMBED -I.'
+       ccflags="-Zomf -Zmt -DDOSISH -DOS2=2 -DEMBED -I. $_defemxcrtrev"
     else
-       ccflags='-Zomf -Zmt -DDOSISH -DOS2=2 -DEMBED -I. -DEMX_BAD_SBRK'
+       ccflags="-Zomf -Zmt -DDOSISH -DOS2=2 -DEMBED -I. -DEMX_BAD_SBRK $_defemxcrtrev"
     fi
     use_clib='c_import'
     usedl='define'
@@ -247,6 +255,8 @@ nm_opt='-p'
 
 ####### We define these functions ourselves
 
+d_strtoll='define'
+d_strtoull='define'
 d_getprior='define'
 d_setprior='define'
 
@@ -257,9 +267,73 @@ d_setprior='define'
 # Commented:
 #startsh='extproc ksh\\n#! sh'
 
-# Copy pod:
+# Find patch:
+gnupatch='patch'
+if (gnupatch -v || gnupatch --version)   2>&1 >/dev/null; then
+    gnupatch=gnupatch
+else
+    if (gpatch -v || gpatch --version)   2>&1 >/dev/null; then
+       gnupatch=gpatch
+    else
+       # They may have a special PATH during configuring
+       if (patch -v || patch --version) 2>&1 >/dev/null; then
+           gnupatch="`./UU/loc patch.exe undef $pth`"
+       fi
+    fi
+fi
 
-cp ./README.os2 ./pod/perlos2.pod
+# Apply patches if needed
+case "$0$running_c_cmd" in
+  *[/\\]Configure|*[/\\]Configure.|Configure|Configure.) # Skip Configure.cmd
+    if grep "^libnames" ./Configure > /dev/null; then
+       # Not patched!
+       if test -f ./Configure.cmd ; then
+           echo "!!!" >&2
+           echo "!!! I see that what is running is ./Configure." >&2
+           echo "!!! ./Configure is not patched, but ./Configure.cmd exists." >&2
+           echo "!!!" >&2
+           echo "!!! You are supposed to run Configure.cmd, not Configure" >&2
+           echo "!!!  after an automagic patching." >&2
+           echo "!!!" >&2
+           echo "!!! If you insist on running Configure, please" >&2
+           echo "!!!  patch it manually from ./os2/diff.configure." >&2
+           echo "!!!" >&2
+           exit 2
+       fi
+       echo "!!!" >&2
+       echo "!!! You did not patch ./Configure!" >&2
+       echo "!!! I create Configure.cmd and patch it from ./os2/diff.configure." >&2
+       echo "!!!" >&2
+       echo "$gnupatch -b -p1 --output=Configure.cmd <./os2/diff.configure 2>&1 | tee 00_auto_patch" >&2
+       ($gnupatch -b -p1 --output=Configure.cmd <./os2/diff.configure 2>&1 | tee 00_auto_patch) >&2
+       echo "!!!" >&2
+       echo "!!! The report of patching is copied to 00_auto_patch." >&2
+       echo "!!! Now you need to restart Configure.cmd with all the options" >&2
+       echo "!!!" >&2
+       echo "extproc sh" > Configure.ctm
+       cat Configure.cmd >> Configure.ctm && mv -f Configure.ctm Configure.cmd
+       exit 0
+    else
+       echo "!!! Apparently we are running a patched Configure." >&2
+    fi 
+    ;;
+  *) echo "!!! Apparently we are running a renamed Configure: '$0'." >&2
+esac
+
+# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use threads.
+cat > UU/usethreads.cbu <<'EOCBU'
+case "$usethreads" in
+$define|true|[yY]*)
+       ccflags="-Zmt $ccflags"
+        cppflags="-Zmt $cppflags"  # Do we really need to set this?
+        aout_ccflags="-DUSE_THREADS $aout_ccflags"
+        aout_cppflags="-DUSE_THREADS $aout_cppflags"
+        aout_lddlflags="-Zmt $aout_lddlflags"
+        aout_ldflags="-Zmt $aout_ldflags"
+       ;;
+esac
+EOCBU
 
 # Now install the external modules. We are in the ./hints directory.
 
@@ -289,20 +363,9 @@ for xxx in * ; do
        fi
 done
 
-# This script UU/usethreads.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use threads.
-cat > UU/usethreads.cbu <<'EOCBU'
-case "$usethreads" in
-$define|true|[yY]*)
-       ccflags="-Zmt $ccflags"
-        cppflags="-Zmt $cppflags"  # Do we really need to set this?
-        aout_ccflags="-DUSE_THREADS $aout_ccflags"
-        aout_cppflags="-DUSE_THREADS $aout_cppflags"
-        aout_lddlflags="-Zmt $aout_lddlflags"
-        aout_ldflags="-Zmt $aout_ldflags"
-       ;;
+case "$ldlibpthname" in
+'') ldlibpthname=none ;;
 esac
-EOCBU
 
 # Now go back
 cd ../..