From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 26 Jul 2009 01:41:08 +0000 (-0400)
Subject: Use scripts/cvo.sh in the build script to get better subdir names
X-Git-Tag: NTP_4_2_5P194~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=971aa1c3eb57a3739a66e488b5ab62ec00d38589;p=thirdparty%2Fntp.git

Use scripts/cvo.sh in the build script to get better subdir names

bk: 4a6bb434dxaQRb2NP-AE-jDzEDUEug
---

diff --git a/ChangeLog b/ChangeLog
index 9812899af..2e60d9029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Use scripts/cvo.sh in the build script to get better subdir names.
 (4.2.5p193) 2009/07/25 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1261] CID 34: simulate_server() rbuf.msg_flags uninitialized.
 * [Bug 1262] CID 35: xpkt.mac uninitialized in simulate_server().
diff --git a/build b/build
index 2a65d8678..aa923309e 100755
--- a/build
+++ b/build
@@ -30,7 +30,7 @@ esac
 #set -e
 #set -x
 
-CVO=`./config.guess`
+CVO=`./scripts/cvo.sh @cvo@`
 case "$CVO" in
  *-*-*) ;;
  *) echo "config.guess returned <$CVO>, which makes no sense to me."
diff --git a/scripts/cvo.sh b/scripts/cvo.sh
new file mode 100755
index 000000000..62e7187de
--- /dev/null
+++ b/scripts/cvo.sh
@@ -0,0 +1,120 @@
+#! /bin/sh
+
+# Copyright 2002, Harlan Stenn.  Used by NTP with permission.
+# Author: Harlan Stenn <harlan+cvo@pfcs.com>
+
+# Possible output formats:
+#
+# CVO=...		Shell variable
+# CVO=... ; export CVO	Old-style exported envariable
+# export CVO=...	New-style exported envariable
+# setenv CVO ...	csh-style exported envariable
+
+TS="$*"
+
+CVO_raw=`config.guess`
+CVO=$CVO_raw
+
+set 1 `echo $CVO | tr '-' ' '`
+shift
+
+case "$#" in
+ 4) # eg: i686-pc-linux-gnu
+    CVO_CPU=$1
+    CVO_VENDOR=$2
+    cvo_KERN=$3			# Note the capitalization...
+    CVO_OS=$4
+    case "$cvo_KERN" in
+     linux)			# Braindamage.  We want OS, not kernel info
+	if false
+	then
+	    :
+	elif test -f /etc/mandrake-release
+	then
+	    set `cat /etc/mandrake-release`
+	    CVO_OS=mandrake$4
+	    CVO_KOSVER=`uname -r`
+	elif test -f /etc/redhat-release
+	then
+	    set `cat /etc/redhat-release`
+	    case "$3" in
+	     Enterprise)
+	        CVO_OS=redhat$7.E
+	        ;;
+	     Linux)
+	        CVO_OS=redhat$5
+		;;
+	    esac
+	    CVO_KOSVER=`uname -r`
+	else
+	    CVO_OS=$cvo_KERN`uname -r`
+	fi
+	;;
+     *)
+	echo "gronk - I don't understand <$CVO>!"
+	exit 1
+	;;
+    esac
+    ;;
+ 3) CVO_CPU=$1
+    CVO_VENDOR=$2
+    CVO_OS=$3
+    ;;
+ *) echo "gronk - config.guess returned $# pieces, not 3 pieces!"
+    exit 1
+    ;;
+esac
+
+case "$CVO_OS" in
+ cygwin)
+    # Decisions, decisions.
+    # uname -r is the cygwin version #, eg: 1.3.3(0.46/3/2)
+    # uname -s returns something like CYGWIN_NT-5.0
+    CVO_OS="$CVO_OS`uname -r | sed 's/(.*//'`"
+    ;;
+esac
+set `echo $CVO_OS | sed 's/\([0-9]\)/ \1/'`
+
+case "$#" in
+ 2) ;;
+ *) echo "gronk - <$CVO_OS> expanded to $#, not 2 pieces!"
+    exit 1
+    ;;
+esac
+
+CVO_OSNAME=$1
+CVO_OSVER=$2
+
+case "$CVO_OSNAME" in
+ solaris)
+    CVO_KOSVER=`uname -v`
+    ;;
+esac
+
+CVO=$CVO_CPU-$CVO_VENDOR-$CVO_OS
+
+case "$TS" in
+ '')
+    set | grep CVO
+    ;;
+ *)
+    # keys['cvo'] = "cvo.CVO['CVO']"
+    TS=`echo $TS | sed -e s/@cvo@/$CVO/g`
+    # keys['cpu'] = "cvo.CVO['CVO_CPU']"
+    TS=`echo $TS | sed -e s/@cpu@/$CVO_CPU/g`
+    # keys['kosver'] = "cvo.CVO['CVO_KOSVER']"
+    TS=`echo $TS | sed -e s/@kosver@/$CVO_KOSVER/g`
+    # keys['os'] = "cvo.CVO['CVO_OS']"
+    TS=`echo $TS | sed -e s/@os@/$CVO_OS/g`
+    # keys['osname'] = "cvo.CVO['CVO_OSNAME']"
+    TS=`echo $TS | sed -e s/@osname@/$CVO_OSNAME/g`
+    # keys['osver'] = "cvo.CVO['CVO_OSVER']"
+    TS=`echo $TS | sed -e s/@osver@/$CVO_OSVER/g`
+    # keys['vendor'] = "cvo.CVO['CVO_VENDOR']"
+    TS=`echo $TS | sed -e s/@vendor@/$CVO_VENDOR/g`
+    # keys['raw'] = "cvo.CVO['CVO_raw']"
+    TS=`echo $TS | sed -e s/@raw@/$CVO_raw/g`
+
+    echo $TS
+    ;;
+esac