calming down userland download ;)

[Olexiy Avramchenko <olexiy at irtech dot cn dot ua>]

Hi, Dan
What do you think about such patch ? It provides:
1. "all.sh" - set PTXDIST_DIR only when --builduserland passed to "all.sh".
2. "getandpatch.sh" - try to unpack/download  $PTXDIST_DIR only when 
variable is non-empty.

   Olexiy

diff -N2 -ru crosstool-0.28-rc15.orig/all.sh crosstool-0.28-rc15/all.sh
--- crosstool-0.28-rc15.orig/all.sh	2004-03-31 09:37:37.000000000 +0300
+++ crosstool-0.28-rc15/all.sh	2004-05-17 10:50:52.000000000 +0300
@@ -27,8 +27,4 @@
 test -z "${KERNELCONFIG}" || test -r "${KERNELCONFIG}"  || abort  "Can't read file KERNELCONFIG = $KERNELCONFIG, please fix."
 
-# Ah, nobody would want to change this :-)
-PTXDIST_DIR=ptxdist-testing-20031113
-export PTXDIST_DIR
-
 set -ex
 
@@ -90,4 +86,9 @@
 
 if test "$opt_no_unpack" = ""; then
+   if test "$opt_builduserland" = "1"; then
+      # Ah, nobody would want to change this :-)
+      PTXDIST_DIR=ptxdist-testing-20031113
+      export PTXDIST_DIR
+   fi
    # Download and patch
    rm -rf $BUILD_DIR; mkdir -p $BUILD_DIR
diff -N2 -ru crosstool-0.28-rc15.orig/getandpatch.sh crosstool-0.28-rc15/getandpatch.sh
--- crosstool-0.28-rc15.orig/getandpatch.sh	2004-05-14 15:36:40.000000000 +0300
+++ crosstool-0.28-rc15/getandpatch.sh	2004-05-17 10:52:29.000000000 +0300
@@ -19,5 +19,4 @@
 test -z "${LINUX_DIR}"        && abort "Please set LINUX_DIR to the bare filename of the kernel tarball or directory"
 test -z "${TARBALLS_DIR}"     && abort "Please set TARBALLS_DIR to the directory to download tarballs to."
-test -z "${PTXDIST_DIR}"      && abort "Please set PTXDIST_DIR to the bare filename of the ptxdist tarball or directory."
 
 # Make all paths absolute (it's so confusing otherwise)
@@ -141,6 +140,8 @@
 # Download, unpack, and patch all the needed source tarballs,
 
-# FIXME: even if we're not building userland, let's grab it...
-getUnpackAndPatch http://www.kegel.com/crosstool/$PTXDIST_DIR.tar.gz
+# Grab it if we want to build userland...
+if test -n "$PTXDIST_DIR" ; then
+   getUnpackAndPatch http://www.kegel.com/crosstool/$PTXDIST_DIR.tar.gz
+fi
 
 if test x"$BINUTILS_URL" = x; then

------
Want more information?  See the CrossGCC FAQ, http://www.objsw.com/CrossGCC/
Want to unsubscribe? Send a note to crossgcc-unsubscribe@sources.redhat.com