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