crosstool-0.37-001-silent.patch

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

From: "Yann E. MORIN" <[e-mail]>
To: [e-mail]
Subject: Patch - 001 - silent crosstool execution
Date: Mon, 11 Jul 2005 23:01:32 +0200
Cc: Dan Kegel <[e-mail]>

Hello all!

Here is the first in a set of patches againt crosstool-0.37.

...

YEM-20050711

COPYRIGHT: GNU GPLv2 or later, if that matters. See: 
    http://www.fsf.org/licensing/licenses/gpl.txt

It allows one to define a SILENT var in the environment so that crosstool
does not spit out all the commands it executes. Output of these commands is
preserved, of course.

diff -dur crosstool-0.37.orig/all.sh crosstool-0.37.silent/all.sh
--- crosstool-0.37.orig/all.sh	2005-07-07 23:18:01.000000000 +0200
+++ crosstool-0.37.silent/all.sh	2005-07-11 21:33:47.000000000 +0200
@@ -36,7 +36,8 @@
 
 test -z "${KERNELCONFIG}" || test -r "${KERNELCONFIG}"  || abort  "Can't read file KERNELCONFIG = $KERNELCONFIG, please fix."
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 TOOLCOMBO=$GCC_DIR-$GLIBC_DIR
 BUILD_DIR=`pwd`/build/$TARGET/$TOOLCOMBO
diff -dur crosstool-0.37.orig/buildrpms.sh crosstool-0.37.silent/buildrpms.sh
--- crosstool-0.37.orig/buildrpms.sh	2005-07-04 20:07:30.000000000 +0200
+++ crosstool-0.37.silent/buildrpms.sh	2005-07-11 21:34:09.000000000 +0200
@@ -10,7 +10,9 @@
 # (http://www.fedoraproject.org/wiki/fedora_2drpmdevtools)
 # and use fedora-buildrpmtree to set up your ~/.rpmrc and rpmbuild directory
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
+
 #tar -xzvf crosstool-0.37.tar.gz
 TOOLCOMBOS="gcc-3.4.3-glibc-2.2.2" 
 export TOOLCOMBOS
diff -dur crosstool-0.37.orig/buildsrpms.sh crosstool-0.37.silent/buildsrpms.sh
--- crosstool-0.37.orig/buildsrpms.sh	2005-07-10 22:24:07.000000000 +0200
+++ crosstool-0.37.silent/buildsrpms.sh	2005-07-11 21:34:32.000000000 +0200
@@ -12,7 +12,8 @@
     exec false
 }
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 # User must have created ~/.rpmmacros containing at least a line like
 # %_topdir      %(echo $HOME)/rpmbuild
diff -dur crosstool-0.37.orig/clean.sh crosstool-0.37.silent/clean.sh
--- crosstool-0.37.orig/clean.sh	2005-07-10 23:09:11.000000000 +0200
+++ crosstool-0.37.silent/clean.sh	2005-07-11 21:07:57.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Prepare a copy for distribution
-set -x
+[ -z "${SILENT}" ] && set -x
 rm -rf log log[0-9] *.log boards build dejagnu-1.4.3 dejagnu-1.4.3.tar.gz result tarballs jail.tar.gz *.sum2
 find . -type f | xargs chmod 644
 find . -type d | xargs chmod 755
diff -dur crosstool-0.37.orig/crosstest.sh crosstool-0.37.silent/crosstest.sh
--- crosstool-0.37.orig/crosstest.sh	2005-05-20 07:54:43.000000000 +0200
+++ crosstool-0.37.silent/crosstest.sh	2005-07-11 21:39:36.000000000 +0200
@@ -1,5 +1,6 @@
 #!/bin/sh
-set -x -e
+[ -z "${SILENT}" ] && set -x
+set -e
 
 abort() {
     echo $@
@@ -145,7 +146,7 @@
     > ../tests.out
 
 echo "#!/bin/sh" > ../glibctest.sh
-echo "set -x" >> ../glibctest.sh
+echo '[ -z "${SILENT}" ] && set -x' >> ../glibctest.sh
 # be nice to the tests in dlfcn and elf, which contain hardcoded paths
 echo "rm -rf $BUILD_DIR || true" >> ../glibctest.sh
 
diff -dur crosstool-0.37.orig/crosstool-cygwin.sh crosstool-0.37.silent/crosstool-cygwin.sh
--- crosstool-0.37.orig/crosstool-cygwin.sh	2005-03-08 01:34:34.000000000 +0100
+++ crosstool-0.37.silent/crosstool-cygwin.sh	2005-07-11 21:34:49.000000000 +0200
@@ -73,7 +73,8 @@
 # you can't find a host compiler by appending -gcc to our whacky $GCC_HOST
 GCC_HOST=`echo $GCC_HOST | sed s/-/-host_/`
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 # map TARGET to Linux equivalent
 case $TARGET in
diff -dur crosstool-0.37.orig/crosstool.sh crosstool-0.37.silent/crosstool.sh
--- crosstool-0.37.orig/crosstool.sh	2005-07-10 02:47:29.000000000 +0200
+++ crosstool-0.37.silent/crosstool.sh	2005-07-11 22:05:27.000000000 +0200
@@ -14,6 +14,18 @@
     fi
 }
 
+# Makes a path absolute.
+# $1: the name of variable to make absolute
+# Ex: absolute PREFIX
+absolute () {
+    eval tmp="\$$1"
+    case "${tmp}" in
+        /*) RES="${tmp}" ;;
+        *) RES="`pwd`/${tmp}" ;;
+    esac
+    eval $1=$RES
+}
+
 #
 # crosstool.sh
 # Build a GNU/Linux toolchain
@@ -106,51 +118,52 @@
 # by hand, some of these might be misleading.
 # NOTE: surround with "Begin/end" and echo to stdout so we can grep out of the log later.
 
-echo "Begin saving environment"
-> $PREFIX/$TARGET.crosstoolconfig.txt
++doPrintConfig () {
+    echo "Begin saving environment"
+    for var in \
+        AR \
+        BINUTILS_DIR \
+        BINUTILS_EXTRA_CONFIG \
+        BUILD \
+        BUILD_DIR \
+        CC \
+        DEJAGNU \
+        EXTRA_TARGET_CFLAGS \
+        GCC_BUILD \
+        GCC_CORE_DIR \
+        GCC_CORE_EXTRA_CONFIG \
+        GCC_DIR \
+        GCC_EXTRA_CONFIG \
+        GCC_HOST \
+        GCC_LANGUAGES \
+        GDB_DIR \
+        GLIBC_ADDON_OPTIONS \
+        GLIBC_DIR \
+        GLIBC_EXTRA_CC_ARGS \
+        GLIBC_EXTRA_CONFIG \
+        GLIBC_EXTRA_ENV \
+        JUST_DOWNLOAD \
+        KERNELCONFIG \
+        LINUX_DIR \
+        LINUX_SANITIZED_HEADER_DIR \
+        NO_DOWNLOAD  \
+        PREFIX \
+        PTXDIST_DIR \
+        SHARED_MODE \
+        SRC_DIR \
+        TARBALLS_DIR \
+        TARGET \
+        TARGET_CFLAGS \
+        TOP_DIR \
+        USE_SYSROOT \
+        ; do
+            eval echo $var=\$$var
+    done
+    echo "End saving environment"
+}
 
-set -x
-for var in \
-AR \
-BINUTILS_DIR \
-BINUTILS_EXTRA_CONFIG \
-BUILD \
-BUILD_DIR \
-CC \
-DEJAGNU \
-EXTRA_TARGET_CFLAGS \
-GCC_BUILD \
-GCC_CORE_DIR \
-GCC_DIR \
-GCC_EXTRA_CONFIG \
-GCC_HOST \
-GCC_LANGUAGES \
-GDB_DIR \
-GLIBC_ADDON_OPTIONS \
-GLIBC_DIR \
-GLIBC_EXTRA_CC_ARGS \
-GLIBC_EXTRA_CONFIG \
-GLIBC_EXTRA_ENV \
-JUST_DOWNLOAD \
-KERNELCONFIG \
-LINUX_DIR \
-LINUX_SANITIZED_HEADER_DIR \
-NO_DOWNLOAD  \
-PREFIX \
-PTXDIST_DIR \
-SHARED_MODE \
-SRC_DIR \
-TARBALLS_DIR \
-TARGET \
-TARGET_CFLAGS \
-TOP_DIR \
-USE_SYSROOT \
-; do 
-  eval echo $var=\$$var
-  eval echo $var=\$$var >> $PREFIX/$TARGET.crosstoolconfig.txt
-done
-set +x
-echo "End saving environment"
+doPrintConfig
+doPrintConfig > $PREFIX/$TARGET.crosstoolconfig.txt
 
 #---------------------------------------------------------
 
@@ -195,7 +208,8 @@
 *)        EXEEXT="" ;;
 esac
 
-set -ex
+[ -z "${SILENT}" ] && set -x
+set -e
 
 # map TARGET to Linux equivalent
 case $TARGET in
@@ -222,14 +236,15 @@
 
 # Make all paths absolute (it's so confusing otherwise)
 # FIXME: this doesn't work well with some automounters
-PREFIX=`cd $PREFIX; pwd`
-BUILD_DIR=`cd $BUILD_DIR; pwd`
-SRC_DIR=`cd $SRC_DIR; pwd`
-BINUTILS_DIR=`cd ${SRC_DIR}/${BINUTILS_DIR}; pwd`
-GCC_DIR=`cd ${SRC_DIR}/${GCC_DIR}; pwd`
-GCC_CORE_DIR=`cd ${SRC_DIR}/${GCC_CORE_DIR}; pwd`
-LINUX_HEADER_DIR=`cd ${SRC_DIR}/${LINUX_HEADER_DIR}; pwd`
-GLIBC_DIR=`cd ${SRC_DIR}/${GLIBC_DIR}; pwd`
+absolute PREFIX
+absolute BUILD_DIR
+absolute SRC_DIR
+absolute BINUTILS_DIR
+absolute GCC_DIR
+absolute GCC_CORE_DIR
+absolute LINUX_DIR
+absolute LINUX_HEADER_DIR
+absolute LIBC_DIR
 
 # Always install the bootstrap gcc (used to build glibc)
 # somewhere it can't interfere with the final gcc.
@@ -347,11 +362,18 @@
 mkdir -p build-binutils; cd build-binutils
 
 if test '!' -f Makefile; then
-    ${BINUTILS_DIR}/configure $CANADIAN_BUILD --target=$TARGET --host=$GCC_HOST --prefix=$PREFIX --disable-nls ${BINUTILS_EXTRA_CONFIG} $BINUTILS_SYSROOT_ARG
+    ${BINUTILS_DIR}/configure \
+        $CANADIAN_BUILD \
+        --target=$TARGET \
+        --host=$GCC_HOST \
+        --prefix=$PREFIX \
+        --disable-nls \
+        ${BINUTILS_EXTRA_CONFIG} \
+        $BINUTILS_SYSROOT_ARG  || abort "Build failed during binutils configure."
 fi
 
-make $PARALLELMFLAGS all 
-make install 
+make $PARALLELMFLAGS all || abort "Build failed during binutils build."
+make install || abort "Build failed during binutils install."
 
 if test x"$CORE_PREFIX" != x"$PREFIX"; then
     # if we're using a different core compiler, make binutils available to it
@@ -398,7 +420,7 @@
             ${GLIBC_DIR}/configure --prefix=/usr \
             --build=$BUILD --host=$TARGET \
             --without-cvs --disable-sanity-checks --with-headers=$HEADERDIR \
-            --enable-hacker-mode
+            --enable-hacker-mode || abort "Build failed during glibc headers configure."
     fi
 
     if grep -q GLIBC_2.3 ${GLIBC_DIR}/ChangeLog; then
@@ -409,7 +431,7 @@
         # The real fix would be to get install-headers to not generate errlist-compat.c.
         # Note: BOOTSTRAP_GCC is used by patches/glibc-2.3.5/glibc-mips-bootstrap-gcc-header-install.patch
         libc_cv_ppc_machine=yes \
-                make CFLAGS=-DBOOTSTRAP_GCC sysdeps/gnu/errlist.c
+                make CFLAGS=-DBOOTSTRAP_GCC sysdeps/gnu/errlist.c || abort "Build failed during glibc headers preparation (errlist.c)."
         mkdir -p stdio-common
         # sleep for 2 seconds for benefit of filesystems with lousy time resolution, like FAT,
         # so make knows for sure errlist-compat.c doesn't need generating
@@ -418,7 +440,7 @@
     fi
     # Note: BOOTSTRAP_GCC is used by patches/glibc-2.3.5/glibc-mips-bootstrap-gcc-header-install.patch
     libc_cv_ppc_machine=yes \
-    make cross-compiling=yes install_root=${SYSROOT} CFLAGS=-DBOOTSTRAP_GCC $GLIBC_SYSROOT_ARG install-headers
+    make cross-compiling=yes install_root=${SYSROOT} CFLAGS=-DBOOTSTRAP_GCC $GLIBC_SYSROOT_ARG install-headers || abort "Build failed during glibc headers install."
 
     # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
     # so do them by hand.  We can tolerate an empty stubs.h for the moment.
@@ -464,12 +486,14 @@
         --enable-symvers=gnu \
         --enable-__cxa_atexit \
         --enable-languages=c \
-        --disable-shared