<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22739">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "crossgcc: Build libelf from elfutils 0.170"<br><br>This reverts commit 4cde9a752aca6aa75c6e028d301b276a53c2a472.<br><br>The version from elfutils has very different build dependencies and<br>breaks building on many platforms. Also, we accidentally build the<br>whole elfutils package instead of libelf only. Let's revert until<br>somebody has the time to do it properly.<br><br>Change-Id: Ib2b3603de40fdb95ca8c5f7489acf034749499dd<br>---<br>M util/crossgcc/buildgcc<br>A util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch<br>D util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum<br>A util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum<br>4 files changed, 34 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/22739/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc<br>index 76ed1be..2efe1ac 100755<br>--- a/util/crossgcc/buildgcc<br>+++ b/util/crossgcc/buildgcc<br>@@ -18,8 +18,8 @@<br> <br> cd $(dirname $0)<br> <br>-CROSSGCC_DATE="October 15th, 2017"<br>-CROSSGCC_VERSION="1.50"<br>+CROSSGCC_DATE="December 5th, 2017"<br>+CROSSGCC_VERSION="1.51"<br> CROSSGCC_COMMIT=$( git describe )<br> <br> # default settings<br>@@ -38,7 +38,7 @@<br> GMP_VERSION=6.1.2<br> MPFR_VERSION=3.1.5<br> MPC_VERSION=1.0.3<br>-LIBELF_VERSION=0.170<br>+LIBELF_VERSION=0.8.13<br> GCC_VERSION=6.3.0<br> GCC_AUTOCONF_VERSION=2.69<br> BINUTILS_VERSION=2.29.1<br>@@ -58,7 +58,7 @@<br> GMP_ARCHIVE="https://ftpmirror.gnu.org/gmp/gmp-${GMP_VERSION}.tar.xz"<br> MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz"<br> MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz"<br>-LIBELF_ARCHIVE="https://sourceware.org/elfutils/ftp/${LIBELF_VERSION}/elfutils-${LIBELF_VERSION}.tar.bz2"<br>+LIBELF_ARCHIVE="http://www.mr511.de/software/libelf-${LIBELF_VERSION}.tar.gz"<br> GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.bz2"<br> BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz"<br> GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz"<br>@@ -82,7 +82,7 @@<br> GMP_DIR="gmp-${GMP_VERSION}"<br> MPFR_DIR="mpfr-${MPFR_VERSION}"<br> MPC_DIR="mpc-${MPC_VERSION}"<br>-LIBELF_DIR="elfutils-${LIBELF_VERSION}"<br>+LIBELF_DIR="libelf-${LIBELF_VERSION}"<br> GCC_DIR="gcc-${GCC_VERSION}"<br> BINUTILS_DIR="binutils-${BINUTILS_VERSION}"<br> GDB_DIR="gdb-${GDB_VERSION}"<br>diff --git a/util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch b/util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch<br>new file mode 100644<br>index 0000000..d80d1c4<br>--- /dev/null<br>+++ b/util/crossgcc/patches/libelf-0.8.14_64bit_detection.patch<br>@@ -0,0 +1,28 @@<br>+libelf-0.8.13: Fix libelf 64bit detection<br>+<br>+Taken from crosstool-ng and and re-applied to 0.8.13<br>+<br>+diff -urN libelf-0.8.13.orig/configure libelf-0.8.13/configure<br>+--- libelf-0.8.13.orig/configure 2008-05-23 01:18:03.000000000 -0700<br>++++ libelf-0.8.13/configure 2017-07-27 12:41:43.417835628 -0700<br>+@@ -1595,7 +1595,7 @@<br>+ echo $ac_n "(cached) $ac_c" 1>&6<br>+ else<br>+ if test "$cross_compiling" = yes; then<br>+- ac_cv_sizeof_long_long=0<br>++ ac_cv_sizeof_long_long=8<br>+ else<br>+ cat > conftest.$ac_ext <<EOF<br>+ #line 1602 "configure"<br>+diff -urN libelf-0.8.13.orig/configure.in libelf-0.8.13/configure.in<br>+--- libelf-0.8.13.orig/configure.in 2008-05-23 01:17:56.000000000 -0700<br>++++ libelf-0.8.13/configure.in 2017-07-27 12:41:43.421835676 -0700<br>+@@ -90,7 +90,7 @@<br>+ AC_CHECK_SIZEOF(short,2)<br>+ AC_CHECK_SIZEOF(int,4)<br>+ AC_CHECK_SIZEOF(long,4)<br>+-AC_CHECK_SIZEOF(long long,0)<br>++AC_CHECK_SIZEOF(long long,8)<br>+ # Windows port<br>+ AC_CHECK_SIZEOF(__int64, 0)<br>+ <br>diff --git a/util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum b/util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum<br>deleted file mode 100644<br>index a0647e0..0000000<br>--- a/util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum<br>+++ /dev/null<br>@@ -1 +0,0 @@<br>-aff6feac0ff69eb7b240babdf2918f640eadb032 tarballs/elfutils-0.170.tar.bz2<br>diff --git a/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum<br>new file mode 100644<br>index 0000000..daa27c6<br>--- /dev/null<br>+++ b/util/crossgcc/sum/libelf-0.8.13.tar.gz.cksum<br>@@ -0,0 +1 @@<br>+c1d6ac5f182d19dd685c4dfd74eedbfe3992425d tarballs/libelf-0.8.13.tar.gz<br></pre><p>To view, visit <a href="https://review.coreboot.org/22739">change 22739</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22739"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib2b3603de40fdb95ca8c5f7489acf034749499dd </div>
<div style="display:none"> Gerrit-Change-Number: 22739 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>