Change in coreboot[master]: Revert "crossgcc: Build libelf from elfutils 0.170"

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/22739

Change subject: Revert "crossgcc: Build libelf from elfutils 0.170"
......................................................................

Revert "crossgcc: Build libelf from elfutils 0.170"

This reverts commit 4cde9a752aca6aa75c6e028d301b276a53c2a472.

The version from elfutils has very different build dependencies and
breaks building on many platforms. Also, we accidentally build the
whole elfutils package instead of libelf only. Let's revert until
somebody has the time to do it properly.

Change-Id: Ib2b3603de40fdb95ca8c5f7489acf034749499dd
---
M util/crossgcc/buildgcc
A util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch
D util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum
A util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum
4 files changed, 34 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/22739/1

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 76ed1be..2efe1ac 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -18,8 +18,8 @@

cd $(dirname $0)

-CROSSGCC_DATE="October 15th, 2017"
-CROSSGCC_VERSION="1.50"
+CROSSGCC_DATE="December 5th, 2017"
+CROSSGCC_VERSION="1.51"
 CROSSGCC_COMMIT=$( git describe )

# default settings
@@ -38,7 +38,7 @@
 GMP_VERSION=6.1.2
 MPFR_VERSION=3.1.5
 MPC_VERSION=1.0.3
-LIBELF_VERSION=0.170
+LIBELF_VERSION=0.8.13
 GCC_VERSION=6.3.0
 GCC_AUTOCONF_VERSION=2.69
 BINUTILS_VERSION=2.29.1
@@ -58,7 +58,7 @@
 GMP_ARCHIVE="https://ftpmirror.gnu.org/gmp/gmp-$%7BGMP_VERSION%7D.tar.xz"
 MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-$%7BMPFR_VERSION%7D.tar.xz"
 MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-$%7BMPC_VERSION%7D.tar.gz"
-LIBELF_ARCHIVE="https://sourceware.org/elfutils/ftp/$%7BLIBELF_VERSION%7D/elfutils-$%7BLIBEL..."
+LIBELF_ARCHIVE="http://www.mr511.de/software/libelf-$%7BLIBELF_VERSION%7D.tar.gz"
 GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-$%7BGCC_VERSION%7D/gcc-$%7BGCC_VERSION%7D...."
 BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-$%7BBINUTILS_VERSION%7D.tar.xz"
 GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-$%7BGDB_VERSION%7D.tar.xz"
@@ -82,7 +82,7 @@
 GMP_DIR="gmp-${GMP_VERSION}"
 MPFR_DIR="mpfr-${MPFR_VERSION}"
 MPC_DIR="mpc-${MPC_VERSION}"
-LIBELF_DIR="elfutils-${LIBELF_VERSION}"
+LIBELF_DIR="libelf-${LIBELF_VERSION}"
 GCC_DIR="gcc-${GCC_VERSION}"
 BINUTILS_DIR="binutils-${BINUTILS_VERSION}"
 GDB_DIR="gdb-${GDB_VERSION}"
diff --git a/util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch b/util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch
new file mode 100644
index 0000000..d80d1c4
--- /dev/null
+++ b/util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch
@@ -0,0 +1,28 @@
+libelf-0.8.13: Fix libelf 64bit detection
+
+Taken from crosstool-ng and and re-applied to 0.8.13
+
+diff -urN libelf-0.8.13.orig/configure libelf-0.8.13/configure
+--- libelf-0.8.13.orig/configure	2008-05-23 01:18:03.000000000 -0700
++++ libelf-0.8.13/configure	2017-07-27 12:41:43.417835628 -0700
+@@ -1595,7 +1595,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_long_long=0
++  ac_cv_sizeof_long_long=8
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1602 "configure"
+diff -urN libelf-0.8.13.orig/configure.in libelf-0.8.13/configure.in
+--- libelf-0.8.13.orig/configure.in	2008-05-23 01:17:56.000000000 -0700
++++ libelf-0.8.13/configure.in	2017-07-27 12:41:43.421835676 -0700
+@@ -90,7 +90,7 @@
+ AC_CHECK_SIZEOF(short,2)
+ AC_CHECK_SIZEOF(int,4)
+ AC_CHECK_SIZEOF(long,4)
+-AC_CHECK_SIZEOF(long long,0)
++AC_CHECK_SIZEOF(long long,8)
+ # Windows port
+ AC_CHECK_SIZEOF(__int64, 0)
+ 
diff --git a/util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum b/util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum
deleted file mode 100644
index a0647e0..0000000
--- a/util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum
+++ /dev/null
@@ -1 +0,0 @@
-aff6feac0ff69eb7b240babdf2918f640eadb032  tarballs/elfutils-0.170.tar.bz2
diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum
new file mode 100644
index 0000000..daa27c6
--- /dev/null
+++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum
@@ -0,0 +1 @@
+c1d6ac5f182d19dd685c4dfd74eedbfe3992425d  tarballs/libelf-0.8.13.tar.gz