crosstool-0.37-001-silent.patch

linux下编译交叉工具链的工具源码

+        --disable-shared || abort "Build failed during gcc-core configure."
 fi
 
+# YEM-FIXME: I guess it is not usefull to catch errors there
 test "$CANADIAN_BUILD" = "" || make $PARALLELMFLAGS all-build-libiberty || true
-make $PARALLELMFLAGS all-gcc 
-make install-gcc
+
+make $PARALLELMFLAGS all-gcc || abort "Build failed during core gcc build."
+make install-gcc || abort "Build failed during core gcc install."
 
 cd ..
 
@@ -506,7 +530,7 @@
         --without-cvs --disable-profile --disable-debug --without-gd \
         --without-tls --without-__thread \
         $SHARED_MODE \
-        --enable-add-ons${GLIBC_ADDON_OPTIONS} --with-headers=$HEADERDIR
+        --enable-add-ons${GLIBC_ADDON_OPTIONS} --with-headers=$HEADERDIR || abort "Build failed during glibc configure."
 fi
 
 if grep -l '^install-lib-all:' ${GLIBC_DIR}/Makerules > /dev/null; then
@@ -530,8 +554,8 @@
 # The following architectures are known to need kernel .config: alpha, arm, ia64, s390, sh, sparc
 # Note: LD and RANLIB needed by glibc-2.1.3's c_stub directory, at least on macosx
 # No need for PARALLELMFLAGS here, Makefile already reads this environment variable
-make LD=${TARGET}-ld RANLIB=${TARGET}-ranlib $GLIBC_INITIAL_BUILD_RULE
-make install_root=${SYSROOT} $GLIBC_SYSROOT_ARG $GLIBC_INITIAL_INSTALL_RULE
+make LD=${TARGET}-ld RANLIB=${TARGET}-ranlib $GLIBC_INITIAL_BUILD_RULE || abort "Build failed during glibc build."
+make install_root=${SYSROOT} $GLIBC_SYSROOT_ARG $GLIBC_INITIAL_INSTALL_RULE || abort "Build failed during glibc install."
 
 # This doesn't seem to work when building a crosscompiler,
 # as it tries to execute localedef using the just-built ld.so!?
@@ -564,7 +588,7 @@
 done
 cd ..
 
-test -f ${SYSROOT}/lib/libc.a || test -f ${SYSROOT}/lib64/libc.a || test -f ${SYSROOT}/usr/lib/libc.a || test -f ${SYSROOT}/usr/lib64/libc.a || abort Building libc failed
+test -f ${SYSROOT}/lib/libc.a || test -f ${SYSROOT}/lib64/libc.a || test -f ${SYSROOT}/usr/lib/libc.a || test -f ${SYSROOT}/usr/lib64/libc.a || abort "Building failed somewhere in glibc."
 
 #---------------------------------------------------------
 echo Build final gcc
@@ -587,9 +611,10 @@
         --enable-languages="$GCC_LANGUAGES" \
          $SHARED_MODE \
         --enable-c99 \
-        --enable-long-long
+        --enable-long-long || abort "Build failed during final gcc configure."
 fi
 
+# YEM-FIXME: I guess it is not essential that we catch failures there
 test "$CANADIAN_BUILD" = "" || make $PARALLELMFLAGS all-build-libiberty || true
 
 # Idea from <cort.dougan at gmail.com>:
@@ -618,8 +643,8 @@
     ;;
 esac
 
-make $PARALLELMFLAGS all 
-make install 
+make $PARALLELMFLAGS all || abort "Build failed during final gcc build."
+make install || abort "Build failed during final gcc install."
 
 # FIXME: shouldn't people who want this just --disable-multilib in final gcc and be done with it?
 # This code should probably be deleted, it was written long ago and hasn't been tested in ages.
diff -dur crosstool-0.37.orig/gdb.sh crosstool-0.37.silent/gdb.sh
--- crosstool-0.37.orig/gdb.sh	2005-07-10 22:40:38.000000000 +0200
+++ crosstool-0.37.silent/gdb.sh	2005-07-11 21:35:38.000000000 +0200
@@ -3,7 +3,8 @@
 # Dan Kegel
 # Copyright 2004, Andre Ancelin ([e-mail])
 # Copyright 2005, Google
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 abort() {
     echo crosstool: $@
diff -dur crosstool-0.37.orig/getandpatch.sh crosstool-0.37.silent/getandpatch.sh
--- crosstool-0.37.orig/getandpatch.sh	2005-07-06 00:37:25.000000000 +0200
+++ crosstool-0.37.silent/getandpatch.sh	2005-07-11 21:40:13.000000000 +0200
@@ -3,7 +3,8 @@
 # Local patches are found in subdirectories of patches/ with the same name as the tarball but without .tar.gz
 # Copyright 2003 Ixia Communications
 # Licensed under the GPL
-set -xe
+[ -z "${SILENT}" ] && set -x
+set -e
 
 abort() {
 	echo $@
@@ -38,6 +39,9 @@
 
 test -z "${TARBALLS_DIR}"     && abort "Please set TARBALLS_DIR to the directory to download tarballs to."
 
+# YEM: One need the directory to exist before cd'ing into
+mkdir -p "${SRC_DIR}"
+
 # Make all paths absolute (it's so confusing otherwise)
 # FIXME: this doesn't work well with some automounters
 test -z "$JUST_DOWNLOAD" || SRC_DIR=`cd $SRC_DIR; pwd`
@@ -83,7 +87,6 @@
 # Assumes that the tarball unpacks to a name guessable from its url,
 # and that patches already exist locally in a directory named after the tarball.
 getUnpackAndPatch() {
-    set -x
     # Check to see if the tarball already exists
     exists=""
     for arg; do
@@ -128,7 +131,6 @@
     glibc-[a-z]*-2*) echo "It's a glibc addon, so cd into glibc"; cd $GLIBC_DIR ;;
     *) ;;
     esac
-    set +x
 
     case $ARCHIVE_NAME in
     *.gz|*.tgz)
diff -dur crosstool-0.37.orig/glibc-get.sh crosstool-0.37.silent/glibc-get.sh
--- crosstool-0.37.orig/glibc-get.sh	2005-03-08 01:34:34.000000000 +0100
+++ crosstool-0.37.silent/glibc-get.sh	2005-07-11 21:35:52.000000000 +0200
@@ -8,7 +8,8 @@
   exit 1
 fi
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 mkdir -p temp.$$
 cd temp.$$
diff -dur crosstool-0.37.orig/initjail.sh crosstool-0.37.silent/initjail.sh
--- crosstool-0.37.orig/initjail.sh	2005-03-08 01:34:34.000000000 +0100
+++ crosstool-0.37.silent/initjail.sh	2005-07-11 21:40:50.000000000 +0200
@@ -8,7 +8,8 @@
     exit 1
 fi
 
-set -x -e
+[ -z "${SILENT}" ] && set -x
+set -e
 
 case $1 in
 *jail*) echo "jaildir is $1";;
diff -dur crosstool-0.37.orig/install-shared-lib.sh crosstool-0.37.silent/install-shared-lib.sh
--- crosstool-0.37.orig/install-shared-lib.sh	2005-03-08 01:34:34.000000000 +0100
+++ crosstool-0.37.silent/install-shared-lib.sh	2005-07-11 21:29:21.000000000 +0200
@@ -10,7 +10,7 @@
   exec false
 }
 
-#set -x
+[ -z "${SILENT}" ] && set -x
 
 FILE=/etc/ld.so.conf
 BAK=$FILE.bak
diff -dur crosstool-0.37.orig/mkdejagnu.sh crosstool-0.37.silent/mkdejagnu.sh
--- crosstool-0.37.orig/mkdejagnu.sh	2005-03-08 01:34:32.000000000 +0100
+++ crosstool-0.37.silent/mkdejagnu.sh	2005-07-11 21:40:26.000000000 +0200
@@ -1,5 +1,7 @@
 #!/bin/sh
-set -xe
+[ -z "${SILENT}" ] && set -x
+set -e
+
 mkdir -p result/dejagnu
 PREFIX=`pwd`/result/dejagnu
 
diff -dur crosstool-0.37.orig/mkjail.sh crosstool-0.37.silent/mkjail.sh
--- crosstool-0.37.orig/mkjail.sh	2005-03-08 01:34:34.000000000 +0100
+++ crosstool-0.37.silent/mkjail.sh	2005-07-11 21:42:36.000000000 +0200
@@ -9,7 +9,9 @@
     echo $@
     exec false
 }
-set -x
+[ -z "${SILENT}" ] && set -x
+set -e
+
 test $# -ge 2 || abort "Usage: $0 PREFIX ETCPASSWD [PREFIX2], where PREFIX/lib/libc.so.* is the C library to grab, ETCPASSWD is the passwd file to use in the jail, and PREFIX2/bin contains busybox"
 test -d "$1" || abort "Error: $1 is not a directory"
 test -f "$2" || abort "Error: $2 is not a file"
@@ -26,7 +28,6 @@
 done
 test -s "$STRIP" || abort "Error: strip not found"
 test -x "$STRIP" || abort "Error: $STRIP not executable"
-set -e -x
 
 ORIGDIR=`pwd`
 WORKDIR=/tmp/mkjail.$$.tmp
diff -dur crosstool-0.37.orig/mkoverride.sh crosstool-0.37.silent/mkoverride.sh
--- crosstool-0.37.orig/mkoverride.sh	2005-03-08 01:34:34.000000000 +0100
+++ crosstool-0.37.silent/mkoverride.sh	2005-07-11 21:36:08.000000000 +0200
@@ -15,7 +15,8 @@
 test -z "${TARGET}" && abort "Please set TARGET to the Gnu target identifier (e.g. pentium-linux)"
 test -z "${PREFIX}" && abort "Please set PREFIX to where you want the toolchain installed."
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 installOneLib() {
   # Make a unique directory for each shared library named after the file,
diff -dur crosstool-0.37.orig/ptx.sh crosstool-0.37.silent/ptx.sh
--- crosstool-0.37.orig/ptx.sh	2005-05-08 07:51:51.000000000 +0200
+++ crosstool-0.37.silent/ptx.sh	2005-07-11 21:36:24.000000000 +0200
@@ -1,5 +1,6 @@
 #!/bin/sh
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 # Build userspace stuff with ptxdist (http://www.pengutronix.de/software/ptxdist_en.html)
 # but use existing toolchain
diff -dur crosstool-0.37.orig/regtest-kill.sh crosstool-0.37.silent/regtest-kill.sh
--- crosstool-0.37.orig/regtest-kill.sh	2005-07-07 18:22:34.000000000 +0200
+++ crosstool-0.37.silent/regtest-kill.sh	2005-07-11 21:30:38.000000000 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -x
+[ -z "${SILENT}" ] && set -x
 #ALLNODES="k8 fast fast2 dual2"
 
 dn0=`dirname $0`
diff -dur crosstool-0.37.orig/regtest-kill1.sh crosstool-0.37.silent/regtest-kill1.sh
--- crosstool-0.37.orig/regtest-kill1.sh	2005-07-07 18:23:59.000000000 +0200
+++ crosstool-0.37.silent/regtest-kill1.sh	2005-07-11 21:30:29.000000000 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -x
+[ -z "${SILENT}" ] && set -x
 cd /tmp
 
 ps augxw | grep $USER | egrep 'jobdir|gcc.*glibc.*running|crosstool.sh|make' | grep -v grep | awk '{print $2}' > procs
diff -dur crosstool-0.37.orig/regtest-run.sh crosstool-0.37.silent/regtest-run.sh
--- crosstool-0.37.orig/regtest-run.sh	2005-07-10 02:47:01.000000000 +0200
+++ crosstool-0.37.silent/regtest-run.sh	2005-07-11 21:38:03.000000000 +0200
@@ -11,7 +11,7 @@
 # Accumulates results in directory 'jobdir' on current machine
 # Run regtest-report.sh afterwards to generate nice HTML matrix of build results
 
-set -x
+[ -z "${SILENT}" ] && set -x
 
 # Run this command as 'nohup ssh-agent sh crosstool-0.37/regtest-run.sh'
 #ssh-add
@@ -110,7 +110,6 @@
 for cpu in $CPUS; do
    for toolcombo in $TOOLS; do
        cat > jobdir/$cpu-$toolcombo.sh <<_EOF_
-set -x
 cd $CROSSTOOL
 TARBALLS_DIR=$HOME/downloads
 export TARBALLS_DIR
diff -dur crosstool-0.37.orig/rerpm.sh crosstool-0.37.silent/rerpm.sh
--- crosstool-0.37.orig/rerpm.sh	2005-07-04 20:07:21.000000000 +0200
+++ crosstool-0.37.silent/rerpm.sh	2005-07-11 21:37:04.000000000 +0200
@@ -2,7 +2,8 @@
 # Script to demonstrate building srpms and rpms from scratch
 # Useful for testing changes to crosstool.spec.in
 # Uses old syntax for --with and --without so they can be used on red hat 7.1
-set -x
+[ -z "${SILENT}" ] && set -x
+set -e
 
 TOOLCOMBOS="\
 gcc-2.95.3-glibc-2.2.2 \
@@ -17,7 +18,6 @@
 #x86_64 \
 export WANT_CPUS
 
-set -ex
 tar -czvf crosstool-0.37.tar.gz crosstool-0.37
 
 sh crosstool-0.37/buildsrpms.sh 
diff -dur crosstool-0.37.orig/testhello.sh crosstool-0.37.silent/testhello.sh
--- crosstool-0.37.orig/testhello.sh	2005-05-01 00:06:20.000000000 +0200
+++ crosstool-0.37.silent/testhello.sh	2005-07-11 21:37:20.000000000 +0200
@@ -1,5 +1,6 @@
 #!/bin/sh
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 cd $PREFIX
 if test '!' -d tmp; then
diff -dur crosstool-0.37.orig/testjail.sh crosstool-0.37.silent/testjail.sh
--- crosstool-0.37.orig/testjail.sh	2005-05-08 07:52:15.000000000 +0200
+++ crosstool-0.37.silent/testjail.sh	2005-07-11 21:39:51.000000000 +0200
@@ -3,7 +3,8 @@
 # Example use:
 #  TARGET=sh4-unknown-linux-gnu PREFIX=result/gcc-3.3-glibc-2.2.5/sh4-unknown-linux-gnu sh testjail.sh
 
-set -x -e
+[ -z "${SILENT}" ] && set -x
+set -e
 
 # Assume there's an entry in /etc/hosts for the target to run on
 REMOTE=$TARGET
diff -dur crosstool-0.37.orig/testlinux.sh crosstool-0.37.silent/testlinux.sh
--- crosstool-0.37.orig/testlinux.sh	2005-05-15 19:04:50.000000000 +0200
+++ crosstool-0.37.silent/testlinux.sh	2005-07-11 21:37:31.000000000 +0200
@@ -5,7 +5,8 @@
 # For questions, comments or improvements see the crossgcc mailing
 # list at http://sources.redhat.com/ml/crossgcc, but please do your homework first.
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 #env | sort