X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/30500b05e0cd7c98f3f3ddb34d343729aab7b8f7..28b5d7bf98b62fd30fb98fcdb5c701b1b2acdd8f:/hints/os2.sh

diff --git a/hints/os2.sh b/hints/os2.sh
index 9c1355c..6309b19 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -4,7 +4,7 @@
 # Ilya Zakharevich <ilya@math.ohio-state.edu>
 #
 # Trimmed and comments added by 
-#     Andy Dougherty  <doughera@lafcol.lafayette.edu>
+#     Andy Dougherty  <doughera@lafayette.edu>
 #     Exactly what is required beyond a standard OS/2 installation?
 #     (see in README.os2)
 
@@ -111,6 +111,15 @@ i_dlfcn='define'
 # The default one uses exponential notation between 0.0001 and 0.1
 d_Gconvert='gcvt_os2((x),(n),(b))'
 
+cat > UU/uselongdouble.cbu <<'EOCBU'
+# This script UU/uselongdouble.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to use long doubles.
+# If we will use them, let Configure choose us a Gconvert.
+case "$uselongdouble:$d_longdbl:$d_sqrtl:$d_modfl" in
+"$define:$define:$define:$define") d_Gconvert='' ;;
+esac
+EOCBU
+
 # -Zomf build has a problem with _exit() *flushing*, so the test
 # gets confused:
 fflushNULL="define"
@@ -122,19 +131,23 @@ aout_lib_ext='.a'
 aout_ar='ar'
 aout_plibext='.a'
 aout_lddlflags="-Zdll $ld_dll_optimize"
+
+# -D__ST_MT_ERRNO__ allows a quick relink with -Zmtd to check problems
+# which may be due to linking with -Zmtd DLLs
+
 # Cannot have 32000K stack: get SYS0170  ?!
 if [ $emxcrtrev -ge 50 ]; then 
-    aout_ldflags='-Zexe -Zsmall-conv -Zstack 16000'
+    aout_ldflags='-Zexe -Zsmall-conv -Zstack 16000 -D__ST_MT_ERRNO__'
 else
-    aout_ldflags='-Zexe -Zstack 16000'
+    aout_ldflags='-Zexe -Zstack 16000 -D__ST_MT_ERRNO__'
 fi
 
 # To get into config.sh:
 aout_ldflags="$aout_ldflags"
 
 aout_d_fork='define'
-aout_ccflags="-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I. $_defemxcrtrev"
-aout_cppflags="-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I. $_defemxcrtrev"
+aout_ccflags="-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I. $_defemxcrtrev -D__ST_MT_ERRNO__"
+aout_cppflags="-DDOSISH -DPERL_IS_AOUT -DOS2=2 -DEMBED -I. $_defemxcrtrev -D__ST_MT_ERRNO__"
 aout_use_clib='c'
 aout_usedl='undef'
 aout_archobjs="os2.o dl_os2.o"
@@ -262,6 +275,8 @@ d_strtoll='define'
 d_strtoull='define'
 d_getprior='define'
 d_setprior='define'
+d_usleep='define'
+d_usleepproto='define'
 
 # The next two are commented. pdksh handles #!, extproc gives no path part.
 # sharpbang='extproc '
@@ -441,11 +456,7 @@ fi
 
 cd ./os2/OS2
 
-if ! test -d ../../ext/OS2 ; then
-   mkdir ../../ext/OS2
-fi
-
-cp -rfu * ../../ext/OS2/
+cp -rfu * ../../ext/
 
 # Install tests: