[coreboot-gerrit] Patch set updated for coreboot: util/crossgcc: Build gmp, mpfr, mpc, libelf, expat, python and iasl for the host

[Nico Huber]

Nico Huber ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13472

-gerrit

commit 25bf785188d95c82fe8cc9ba379c9a5fa561becb
Author: Nico Huber 
Date:   Tue Jan 26 16:14:06 2016 +0100

util/crossgcc: Build gmp, mpfr, mpc, libelf, expat, python and iasl for the host

Change-Id: I731cfe230304ccafad3e1f0527592c6a382e2cb1
    Signed-off-by: Nico Huber 
---
 util/crossgcc/buildgcc | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index d3a3cec..61c26d9 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -18,8 +18,8 @@

cd $(dirname $0)

-CROSSGCC_DATE="November 25th, 2015"
-CROSSGCC_VERSION="1.33"
+CROSSGCC_DATE="January 26th, 2016"
+CROSSGCC_VERSION="1.35"

# default settings
 PACKAGE=GCC
@@ -404,7 +404,7 @@ EOF
 }

build_GMP() {
-	CC="$CC" CFLAGS="-Os" ../${GMP_DIR}/configure --disable-shared --enable-fat --prefix=$TARGETDIR $OPTIONS \
+	CC="$CC" CFLAGS="-Os" ../${GMP_DIR}/configure --disable-shared --enable-fat --prefix=$HOSTDIR $OPTIONS \
    	|| touch .failed
    $MAKE $JOBS || touch .failed
    $MAKE install DESTDIR=$DESTDIR || touch .failed
@@ -413,15 +413,15 @@ build_GMP() {

# Now set CFLAGS to match GMP CFLAGS but strip out -pedantic
    # as GCC 4.6.x fails if it's there.
-	export HOSTCFLAGS=$(grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d" -f2 |\
+	export HOSTCFLAGS=$(grep __GMP_CFLAGS $DESTDIR$HOSTDIR/include/gmp.h |cut -d" -f2 |\
        sed s,-pedantic,,)
 }

build_MPFR() {
    test $UNAME = "Darwin" && CFLAGS="$CFLAGS -force_cpusubtype_ALL"
-	CC="$CC" ../${MPFR_DIR}/configure --disable-shared --prefix=$TARGETDIR \
-		--infodir=$TARGETDIR/info \
-		--with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \
+	CC="$CC" ../${MPFR_DIR}/configure --disable-shared --prefix=$HOSTDIR \
+		--infodir=$HOSTDIR/info \
+		--with-gmp=$DESTDIR$HOSTDIR CFLAGS="$HOSTCFLAGS" || \
    	touch .failed
    $MAKE $JOBS || touch .failed
    $MAKE install DESTDIR=$DESTDIR || touch .failed
@@ -430,14 +430,14 @@ build_MPFR() {

# work around build problem of libgmp.la
    if [ "$DESTDIR" != "" ]; then
-	    perl -pi -e "s,$DESTDIR,," $DESTDIR$TARGETDIR/libgmp.la
+	    perl -pi -e "s,$DESTDIR,," $DESTDIR$HOSTDIR/libgmp.la
    fi
 }

build_MPC() {
-	CC="$CC" ../${MPC_DIR}/configure --disable-shared --prefix=$TARGETDIR \
-		--infodir=$TARGETDIR/info --with-mpfr=$DESTDIR$TARGETDIR \
-		--with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \
+	CC="$CC" ../${MPC_DIR}/configure --disable-shared --prefix=$HOSTDIR \
+		--infodir=$HOSTDIR/info --with-mpfr=$DESTDIR$HOSTDIR \
+		--with-gmp=$DESTDIR$HOSTDIR CFLAGS="$HOSTCFLAGS" || \
    	touch .failed
    $MAKE $JOBS || touch .failed
    $MAKE install DESTDIR=$DESTDIR || touch .failed
@@ -447,10 +447,10 @@ build_MPC() {

build_LIBELF() {
    CC="$CC" CFLAGS="$HOSTCFLAGS" libelf_cv_elf_h_works=no \
-	../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \
-		--infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed
+	../${LIBELF_DIR}/configure --disable-shared --prefix=$HOSTDIR \
+		--infodir=$HOSTDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed
    $MAKE $JOBS || touch .failed
-	$MAKE install prefix=$DESTDIR$TARGETDIR || touch .failed
+	$MAKE install prefix=$DESTDIR$HOSTDIR || touch .failed

normalize_dirs
 }
@@ -482,8 +482,8 @@ build_GCC() {
    	--disable-libssp --disable-bootstrap --disable-nls \
    	--disable-libquadmath --without-headers \
    	${GCC_OPTIONS} --enable-languages="${LANGUAGES}" \
-		--with-gmp=$DESTDIR$TARGETDIR --with-mpfr=$DESTDIR$TARGETDIR \
-		--with-mpc=$DESTDIR$TARGETDIR --with-libelf=$DESTDIR$TARGETDIR \
+		--with-gmp=$DESTDIR$HOSTDIR --with-mpfr=$DESTDIR$HOSTDIR \
+		--with-mpc=$DESTDIR$HOSTDIR --with-libelf=$DESTDIR$HOSTDIR \
    	--with-pkgversion="coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE" \
    	|| touch .failed
    $MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" all-gcc || touch .failed
@@ -497,7 +497,7 @@ build_GCC() {

build_EXPAT() {
    CC="$CC" CFLAGS="$HOSTCFLAGS" ../${EXPAT_DIR}/configure --disable-shared \
-		--prefix=$TARGETDIR --target=${TARGETARCH} || touch .failed
+		--prefix=$HOSTDIR --target=${TARGETARCH} || touch .failed
    $MAKE || touch .failed
    $MAKE install DESTDIR=$DESTDIR || touch .failed

@@ -505,7 +505,7 @@ build_EXPAT() {
 }

build_PYTHON() {
-	CC="$CC" CFLAGS="$HOSTCFLAGS" ../${PYTHON_DIR}/configure --prefix=$TARGETDIR \
+	CC="$CC" CFLAGS="$HOSTCFLAGS" ../${PYTHON_DIR}/configure --prefix=$HOSTDIR \
    	--target=${TARGETARCH} || touch .failed
    $MAKE $JOBS || touch .failed
    $MAKE install DESTDIR=$DESTDIR || touch .failed
@@ -514,14 +514,14 @@ build_PYTHON() {
 }

build_GDB() {
-	export PYTHONHOME=$DESTDIR$TARGETDIR
+	export PYTHONHOME=$DESTDIR$HOSTDIR
    if [ $(uname) != "FreeBSD" -a $(uname) != "NetBSD" ]; then
    	LIBDL="-ldl"
    fi
-	LDFLAGS="-Wl,-rpath,$$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \
+	LDFLAGS="-Wl,-rpath,$$ORIGIN/../lib/ -L$DESTDIR$HOSTDIR/lib \
    	 -lpthread $LIBDL -lutil" \
-	CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \
-	../${GDB_DIR}/configure --prefix=$TARGETDIR \
+	CC="$CC" CFLAGS="$HOSTCFLAGS -I$DESTDIR$HOSTDIR/include" \
+	../${GDB_DIR}/configure --prefix=$HOSTDIR \
    	--target=${TARGETARCH} --disable-werror --disable-nls
    $MAKE $JOBS || touch .failed
    $MAKE install DESTDIR=$DESTDIR || touch .failed
@@ -536,8 +536,8 @@ build_IASL() {
    test $UNAME = "FreeBSD" && HOST="_FreeBSD"
    test $UNAME = "Cygwin" && HOST="_CYGWIN"
    HOST="$HOST" OPT_CFLAGS="-O -D_FORTIFY_SOURCE=2 -D COREBOOT_TOOLCHAIN_VERSION='"coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE"' " CFLAGS="$CFLAGS" $MAKE CC="$CC" iasl || touch $RDIR/.failed
-	rm -f $DESTDIR$TARGETDIR/bin/iasl || touch $RDIR/.failed
-	cp bin/iasl $DESTDIR$TARGETDIR/bin || touch $RDIR/.failed
+	rm -f $DESTDIR$HOSTDIR/bin/iasl || touch $RDIR/.failed
+	cp bin/iasl $DESTDIR$HOSTDIR/bin || touch $RDIR/.failed
 }

build_LLVM() {
@@ -656,13 +656,13 @@ case "$PACKAGE" in
    GCC|gcc)
    	echo "Target architecture is now $TARGETARCH"
    	NAME="${TARGETARCH} cross GCC"
-		PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC"
+		PACKAGES="host-GMP host-MPFR host-MPC host-LIBELF BINUTILS GCC"
    	;;
    GDB|gdb)
    	NAME="${TARGETARCH} cross GDB"
    	PACKAGES="GDB"
    	if [ $SKIPPYTHON -eq 0 ]; then
-			PACKAGES="EXPAT PYTHON $PACKAGES"
+			PACKAGES="host-EXPAT host-PYTHON $PACKAGES"
    	fi
    	;;
    CLANG|clang)
@@ -672,7 +672,7 @@ case "$PACKAGE" in
    	;;
    IASL|iasl)
    	NAME="IASL ACPI compiler"
-		PACKAGES=IASL
+		PACKAGES="host-IASL"
    	;;
    *)
    	printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL)${NC}\n\n";