[LV-tools-commit] toolchain/scripts build_toolchain.sh,1.7,1.8

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5710

Modified Files:
	build_toolchain.sh 
Log Message:
- First lines of code to also handle uClibc. Though, it's not yet being
  built.


Index: build_toolchain.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/build_toolchain.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- build_toolchain.sh	22 May 2005 15:32:37 -0000	1.7
+++ build_toolchain.sh	5 Jun 2005 16:36:46 -0000	1.8
@@ -21,8 +21,8 @@
 #
 # -Werror behavior
 #
-WERROR="--disable-werror"
-# WERROR=""
+# WERROR="--disable-werror"
+WERROR=""
 
 #
 # Flags for make.
@@ -42,13 +42,16 @@
 DO_TIMESTAMP_GCC=0
 DO_TIMESTAMP_GLIBC=0
 DO_TIMESTAMP_PORTS=0
+DO_TIMESTAMP_UCLIBC=0
 DO_PATCHES_BINUTILS=1
 DO_PATCHES_GCC=1
 DO_PATCHES_GLIBC=1
 DO_PATCHES_PORTS=1
+DO_PATCHES_UCLIBC=1
 DO_CHECKS_BINUTILS=1
 DO_CHECKS_GCC=1
 DO_CHECKS_GLIBC=1
+DO_CHECKS_UCLIBC=1
 
 #
 #
@@ -63,9 +66,11 @@
 			TIMESTAMP_GCC="${1}"
 			TIMESTAMP_GLIBC="${1}"
 			TIMESTAMP_PORTS="${1}"
+			TIMESTAMP_UCLIBC="${1}"
 			DO_TIMESTAMP_BINUTILS=1
 			DO_TIMESTAMP_GCC=1
 			DO_TIMESTAMP_GLIBC=1
+			DO_TIMESTAMP_UCLIBC=1
 			shift
 			;;
 		--binutils-timestamp)
@@ -86,12 +91,19 @@
 			DO_TIMESTAMP_GLIBC=1
 			shift
 			;;
+		--uclibc-timestamp|--uClibc-timestamp)
+			shift
+			TIMESTAMP_UCLIBC="${1}"
+			DO_TIMESTAMP_UCLIBC=1
+			shift
+			;;
 		--omit-patches)
 			shift
 			DO_PATCHES_BINUTILS=0
 			DO_PATCHES_GCC=0
 			DO_PATCHES_GLIBC=0
 			DO_PATCHES_PORTS=0
+			DO_PATCHES_UCLIBC=0
 			;;
 		--omit-binutils-patches)
 			shift
@@ -109,11 +121,16 @@
 			shift
 			DO_PATCHES_PORTS=0
 			;;
+		--omit-uclibc-patches|--omit-uClibc-patches)
+			shift
+			DO_PATCHES_UCLIBC=0
+			;;
 		--omit-checks)
 			shift
 			DO_CHECKS_BINUTILS=0
 			DO_CHECKS_GCC=0
 			DO_CHECKS_GLIBC=0
+			DO_CHECKS_UCLIBC=0
 			;;
 		--omit-binutils-checks)
 			shift
@@ -127,12 +144,16 @@
 			shift
 			DO_CHECKS_GLIBC=0
 			;;
+		--omit-uclibc-checks|--omit-uClibc-checks)
+			shift
+			DO_CHECKS_UCLIBC=0
+			;;
 		-*)
 			echo >&2
 			echo "Unrecognized option \"${1}\"" >&2
 			echo >&2
 			echo "Hint:" >&2
-			echo "$0 [--timestamp | --{binutils,glibc,gcc}-timestamp | --omit-patches | --omit-{gcc,glibc,binutils,ports}-patches | --omit-checks | --omit-{binutils,gcc,glibc}-checks] <target>" >&2
+			echo "$0 [--timestamp | --{binutils,glibc,gcc,uclibc}-timestamp | --omit-patches | --omit-{gcc,glibc,binutils,ports,uclibc}-patches | --omit-checks | --omit-{binutils,gcc,glibc,uclibc}-checks] <target>" >&2
 			echo "Target defaults to: ${TARGET}" >&2
 			exit 1
 			;;
@@ -182,7 +203,10 @@
 	vax*ultrix)
 		GCC1_EXTRA_LANGUAGES=",c++"
 		;;
-	vax*linux)
+	vax*linux-*)
+		GCC1_EXTRA_LANGUAGES=",c++"
+		;;
+	vax*linux|vax*linux-gnu)
 		GCC1_EXTRA_LANGUAGES=",c++"
 		;;
 	vax*netbsd)
@@ -271,6 +295,7 @@
 GLIBC_CVS="${UPSTREAM_SANDBOXES_PATH}/glibc/libc-upstream-HEAD"
 GLIBC_PORTS_CVS="${UPSTREAM_SANDBOXES_PATH}/glibc/ports-upstream-HEAD"
 GCC_CVS="${UPSTREAM_SANDBOXES_PATH}/gcc/gcc-upstream-HEAD"
+UCLIBC_SVN="${UPSTREAM_SANDBOXES_PATH}/uclibc/uclibc-upstream-HEAD"
 
 #
 #
@@ -289,11 +314,13 @@
 BINUTILS_SRC="${SRC_BASE}/binutils"
 GLIBC_SRC="${SRC_BASE}/glibc"
 GCC_SRC="${SRC_BASE}/gcc"
+UCLIBC_SRC="${SRC_BASE}/uclibc"
 
 BINUTILS_BUILD="${BUILD_BASE}/binutils"
 GCC1_BUILD="${BUILD_BASE}/gcc1"
 GLIBC_BUILD="${BUILD_BASE}/glibc"
 GCC2_BUILD="${BUILD_BASE}/gcc2"
+UCLIBC_BUILD="${BUILD_BASE}/uclibc"
 
 #
 # Create all the directories
@@ -305,10 +332,12 @@
 mkdir "${BINUTILS_SRC}";	BINUTILS_SRC="`check_path "${BINUTILS_SRC}"`"
 mkdir "${GLIBC_SRC}";		GLIBC_SRC="`check_path "${GLIBC_SRC}"`"
 mkdir "${GCC_SRC}";		GCC_SRC="`check_path "${GCC_SRC}"`"
+mkdir "${UCLIBC_SRC}";		UCLIBC_SRC="`check_path "${UCLIBC_SRC}"`"
 mkdir "${BINUTILS_BUILD}";	BINUTILS_BUILD="`check_path "${BINUTILS_BUILD}"`"
 mkdir "${GCC1_BUILD}";		GCC1_BUILD="`check_path "${GCC1_BUILD}"`"
 mkdir "${GLIBC_BUILD}";		GLIBC_BUILD="`check_path "${GLIBC_BUILD}"`"
 mkdir "${GCC2_BUILD}";		GCC2_BUILD="`check_path "${GCC2_BUILD}"`"
+mkdir "${UCLIBC_BUILD}";	UCLIBC_BUILD="`check_path "${UCLIBC_BUILD}"`"
 
 #
 # Copy pristine sources
@@ -317,6 +346,7 @@
 copy_directory.sh "${GLIBC_CVS}"	"${GLIBC_SRC}"
 copy_directory.sh "${GLIBC_PORTS_CVS}"	"${GLIBC_SRC}"
 copy_directory.sh "${GCC_CVS}"		"${GCC_SRC}"
+copy_directory.sh "${UCLIBC_SVN}"	"${UCLIBC_SRC}"
 
 #
 # Possibly force specific CVS timestamps
@@ -336,13 +366,21 @@
 		execute --restart 6 cvs -z9 update -d -P -D "${TIMESTAMP_GLIBC}"
 	popd
 fi
+if [ "${DO_TIMESTAMP_UCLIBC}" -ne 0 ]; then
+	pushd "${UCLIBC_SRC}"
+		echo "Updating sources with SVN to reflect the state of a given timestamp hasn't ever been tested\!" >&2
+		execute --restart 6 svn update -r "{${TIMESTAMP_UCLIBC}}"
+	popd
+fi
+
 #
 # Patch sources with our local patches
 #
-[ "${DO_PATCHES_BINUTILS}" -ne 0 ] && execute try_patches.sh "binutils"	"${BINUTILS_SRC}" "${VAX_PATCHES_PATH}"
-[ "${DO_PATCHES_GCC}" -ne 0 ] &&      execute try_patches.sh "gcc"	"${GCC_SRC}"	  "${VAX_PATCHES_PATH}"
-[ "${DO_PATCHES_GLIBC}" -ne 0 ] &&    execute try_patches.sh "glibc"	"${GLIBC_SRC}"	  "${VAX_PATCHES_PATH}"
-[ "${DO_PATCHES_PORTS}" -ne 0 ] &&    execute try_patches.sh "ports"	"${GLIBC_SRC}"	  "${VAX_PATCHES_PATH}"
+[ "${DO_PATCHES_BINUTILS}" -ne 0 ] &&	execute try_patches.sh "binutils"	"${BINUTILS_SRC}" "${VAX_PATCHES_PATH}"
+[ "${DO_PATCHES_GCC}" -ne 0 ] &&	execute try_patches.sh "gcc"		"${GCC_SRC}"	  "${VAX_PATCHES_PATH}"
+[ "${DO_PATCHES_GLIBC}" -ne 0 ] &&	execute try_patches.sh "glibc"		"${GLIBC_SRC}"	  "${VAX_PATCHES_PATH}"
+[ "${DO_PATCHES_PORTS}" -ne 0 ] &&	execute try_patches.sh "ports"		"${GLIBC_SRC}"	  "${VAX_PATCHES_PATH}"
+[ "${DO_PATCHES_UCLIBC}" -ne 0 ] &&	execute try_patches.sh "uclibc"		"${UCLIBC_SRC}"	  "${VAX_PATCHES_PATH}"
 
 
 #