<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22773">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">buildgcc: Drop libelf/elfutils<br><br>Looks like we were unnecessarily dragging this around for some time now.<br>GCC's installation manual doesn't mention libelf as a requirement and a<br>build of crossgcc-i386 doesn't show any sign of it being used.<br><br>This also fixes a lot issues on non-GNU distributions that were intro-<br>duced by switching to the elfutils version of libelf.<br><br>Change-Id: Iff308a9bed9ae3842557d251b75d1faadfafe0da<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M util/crossgcc/Makefile<br>M util/crossgcc/buildgcc<br>D util/crossgcc/sum/elfutils-0.170.tar.bz2.cksum<br>3 files changed, 6 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/22773/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile<br>index 24fe942..4ad2c94 100644<br>--- a/util/crossgcc/Makefile<br>+++ b/util/crossgcc/Makefile<br>@@ -71,7 +71,7 @@<br> <br> clean_tempfiles:<br> rm -rf build-*<br>- rm -rf binutils-* gcc-* gmp-* libelf-* mpc-* mpfr-*<br>+ rm -rf binutils-* gcc-* gmp-* mpc-* mpfr-*<br> rm -rf llvm-* clang-tools-* cfe-* compiler-rt-*<br> rm -rf acpica-*<br> rm -rf gdb-*<br>diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc<br>index 780d87a..fe44d48 100755<br>--- a/util/crossgcc/buildgcc<br>+++ b/util/crossgcc/buildgcc<br>@@ -38,7 +38,6 @@<br> GMP_VERSION=6.1.2<br> MPFR_VERSION=3.1.5<br> MPC_VERSION=1.0.3<br>-LIBELF_VERSION=0.170<br> GCC_VERSION=6.3.0<br> GCC_AUTOCONF_VERSION=2.69<br> BINUTILS_VERSION=2.29.1<br>@@ -58,7 +57,6 @@<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> 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>@@ -73,7 +71,7 @@<br> MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-${MAKE_VERSION}.tar.bz2"<br> CMAKE_ARCHIVE="https://cmake.org/files/v3.9/cmake-${CMAKE_VERSION}.tar.gz"<br> <br>-ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE $LIBELF_ARCHIVE \<br>+ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \<br> $GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $IASL_ARCHIVE \<br> $PYTHON_ARCHIVE $EXPAT_ARCHIVE $LLVM_ARCHIVE $CFE_ARCHIVE \<br> $CRT_ARCHIVE $CTE_ARCHIVE $MAKE_ARCHIVE $CMAKE_ARCHIVE"<br>@@ -82,7 +80,6 @@<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> GCC_DIR="gcc-${GCC_VERSION}"<br> BINUTILS_DIR="binutils-${BINUTILS_VERSION}"<br> GDB_DIR="gdb-${GDB_VERSION}"<br>@@ -671,17 +668,6 @@<br> normalize_dirs<br> }<br> <br>-build_LIBELF() {<br>- CC="$(hostcc host)" CXX="$(hostcxx host)" \<br>- CFLAGS="$HOSTCFLAGS" libelf_cv_elf_h_works=no \<br>- ../${LIBELF_DIR}/configure --disable-shared --disable-nls --prefix=$TARGETDIR \<br>- --infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed<br>- $MAKE $JOBS || touch .failed<br>- $MAKE install prefix=$DESTDIR$TARGETDIR || touch .failed<br>-<br>- normalize_dirs<br>-}<br>-<br> build_BINUTILS() {<br> if [ $TARGETARCH = "x86_64-elf" ]; then<br> ADDITIONALTARGET=",i386-elf"<br>@@ -716,7 +702,7 @@<br> --disable-libsanitizer \<br> ${GCC_OPTIONS} --enable-languages="${LANGUAGES}" \<br> --with-gmp=$DESTDIR$TARGETDIR --with-mpfr=$DESTDIR$TARGETDIR \<br>- --with-mpc=$DESTDIR$TARGETDIR --with-libelf=$DESTDIR$TARGETDIR \<br>+ --with-mpc=$DESTDIR$TARGETDIR \<br> --with-pkgversion="coreboot bootstrap v$CROSSGCC_VERSION $CROSSGCC_DATE" \<br> && \<br> $MAKE $JOBS BOOT_CFLAGS="$HOSTCFLAGS" BUILD_CONFIG="" bootstrap && \<br>@@ -759,7 +745,7 @@<br> ${GCC_OPTIONS} --enable-languages="${LANGUAGES}" \<br> --with-system-zlib \<br> --with-gmp=$DESTDIR$TARGETDIR --with-mpfr=$DESTDIR$TARGETDIR \<br>- --with-mpc=$DESTDIR$TARGETDIR --with-libelf=$DESTDIR$TARGETDIR \<br>+ --with-mpc=$DESTDIR$TARGETDIR \<br> --with-pkgversion="coreboot toolchain v$CROSSGCC_VERSION $CROSSGCC_DATE" \<br> || touch .failed<br> $MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" all-gcc || touch .failed<br>@@ -883,7 +869,6 @@<br> GDB|gdb) printf "%s\n" "$GDB_VERSION";;<br> GMP|gmp) printf "%s\n" "$GMP_VERSION";;<br> IASL|iasl) printf "%s\n" "$IASL_VERSION";;<br>- LIBELF|libelf) printf "%s\n" "$LIBELF_VERSION";;<br> MPC|mpc) printf "%s\n" "$MPC_VERSION";;<br> MPFR|mpfr) printf "%s\n" "$MPFR_VERSION";;<br> PYTHON|python) printf "%s\n" "$PYTHON_VERSION";;<br>@@ -979,7 +964,7 @@<br> GCC|gcc)<br> echo "Target architecture is $TARGETARCH"<br> NAME="${TARGETARCH} cross GCC"<br>- PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC"<br>+ PACKAGES="GMP MPFR MPC BINUTILS GCC"<br> ;;<br> GDB|gdb)<br> NAME="${TARGETARCH} cross GDB"<br>@@ -1218,7 +1203,7 @@<br> <br> if [ -n "$BOOTSTRAPONLY" ]; then<br> printf "Building bootstrap compiler only ... \n"<br>- for pkg in GMP MPFR MPC LIBELF GCC; do<br>+ for pkg in GMP MPFR MPC GCC; do<br> build_for_host $pkg<br> done<br> exit 0<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></pre><p>To view, visit <a href="https://review.coreboot.org/22773">change 22773</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/22773"/><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: Iff308a9bed9ae3842557d251b75d1faadfafe0da </div>
<div style="display:none"> Gerrit-Change-Number: 22773 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>