I was looking over the UnixWare bits in config and it looks
like it could be simplified (a little) and at the same time
add support for OpenServer 6.

Since OpenUNIX is really UnixWare 7.1.2 and OpenServer 6 uses
the UnixWare kernel and SVR5 ABI/API we can have a single
unixware-7 target for all three.

The "uname -X | grep Release" on OpenServer 6 givs us "Release = 5v6.0.0"
so we'll need    5|5v6*) at about line 87.

Then we can scrap lines 96 and 97 in favor of
        x[678]*)  echo "i586-sco-unixware7"; exit 0 ;;

Then down at about line 678 we can combine (and enhance) the

*-*-OpenUNIX*)
and 
*-*-[Uu]nix[Ww]are7) OUT="unixware-7"; options="$options no-sse2" ;;
cases into something that looks like this
....
  *-*-[Uu]nix[Ww]are7)
        if [ "$CC" = "gcc" ]; then
          OUT="unixware-7-gcc" ; options="$options no-sse2"
        else    
          OUT="unixware-7" ; options="$options -no-sse2 -D__i386__"
        fi
        ;;
....

See "Undefined symbol OPENSSL_ia32cap_P" thread for why I've added -D__i386__


-- 
Tim Rice                                Multitalents    (707) 887-1469
[EMAIL PROTECTED]
--- openssl-0.9.8/config.old    2005-06-24 14:25:49.380089008 -0700
+++ openssl-0.9.8/config        2005-06-24 22:26:18.287609027 -0700
@@ -84,7 +84,7 @@
            4.2)
                echo "whatever-whatever-unixware1"; exit 0
                ;;
-           5)
+           5|5v6*)
                case "x${VERSION}" in
                    # We hardcode i586 in place of ${MACHINE} for the
                    # following reason. The catch is that even though Pentium
@@ -93,8 +93,7 @@
                    # with i386 is that it makes ./config pass 386 to
                    # ./Configure, which in turn makes make generate
                    # inefficient SHA-1 (for this moment) code.
-                   x7*)  echo "i586-sco-unixware7";           exit 0 ;;
-                   x8*)  echo "i586-unkn-OpenUNIX${VERSION}"; exit 0 ;;
+                   x[678]*)  echo "i586-sco-unixware7";           exit 0 ;;
                esac
                ;;
        esac
@@ -675,14 +674,13 @@
 
   *-*-osf)             OUT="osf1-alpha-cc" ;;
   *-*-tru64)           OUT="tru64-alpha-cc" ;;
-  *-*-OpenUNIX*)
+  *-*-[Uu]nix[Ww]are7)
        if [ "$CC" = "gcc" ]; then
-         OUT="OpenUNIX-8-gcc" 
+         OUT="unixware-7-gcc" ; options="$options no-sse2"
        else    
-         OUT="OpenUNIX-8" 
+         OUT="unixware-7" ; options="$options -no-sse2 -D__i386__"
        fi
        ;;
-  *-*-[Uu]nix[Ww]are7) OUT="unixware-7"; options="$options no-sse2" ;;
   *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0"; options="$options no-sse2 
no-sha512" ;;
   *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1"; options="$options no-sse2 
no-sha512" ;;
   *-*-vos)

Reply via email to