From 563df4ba5fa234dee31e9375ef84d087fba5e8b0 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sun, 31 May 2020 15:25:14 -0400 Subject: [PATCH] update toolchain to 9.1 --- tools.sh | 146 ++++++++++++++++++++++++++----------------------------- 1 file changed, 70 insertions(+), 76 deletions(-) diff --git a/tools.sh b/tools.sh index 7c4f6dd..1a8f2b6 100755 --- a/tools.sh +++ b/tools.sh @@ -123,8 +123,8 @@ function clean-build-directory { #----------------------------------------------------------------------------- # Package functions function Binutils-Pass-1 { - # 5.4. Binutils-2.32 - Pass 1 - local pkg=binutils-2.32.tar.xz + # Binutils-2.34 - Pass 1 + local pkg=binutils-2.34.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -158,8 +158,8 @@ function Binutils-Pass-1 { return } function GCC-Pass-1 { - # 5.5. GCC-8.2.0 - Pass 1 - local pkg=gcc-8.2.0.tar.xz + # GCC-9.2.0 - Pass 1 + local pkg=gcc-9.2.0.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -184,10 +184,10 @@ function GCC-Pass-1 { ;; esac unpack mpfr-4.0.2.tar.xz - unpack gmp-6.1.2.tar.xz + unpack gmp-6.2.0.tar.xz unpack mpc-1.1.0.tar.gz mv -v mpfr-4.0.2 mpfr >> ${logfile} 2>&1 - mv -v gmp-6.1.2 gmp >> ${logfile} 2>&1 + mv -v gmp-6.2.0 gmp >> ${logfile} 2>&1 mv -v mpc-1.1.0 mpc >> ${logfile} 2>&1 mkdir build pushd build >> /dev/null 2>&1 @@ -208,7 +208,6 @@ function GCC-Pass-1 { --disable-threads \ --disable-libatomic \ --disable-libgomp \ - --disable-libmpx \ --disable-libquadmath \ --disable-libssp \ --disable-libvtv \ @@ -229,8 +228,8 @@ function GCC-Pass-1 { return } function Linux-API-Headers { - # Linux-4.20.7 API Headers - local pkg=linux-4.20.12.tar.xz + # Linux-5.5.3 API Headers + local pkg=linux-5.5.3.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -242,8 +241,8 @@ function Linux-API-Headers { make mrproper >> ${logfile} 2>&1 msg_success msg_line " Install: " - make INSTALL_HDR_PATH=dest headers_install >> ${logfile} 2>&1 - cp -rv dest/include/* /tools/include >> ${logfile} 2>&1 + make headers >> ${logfile} 2>&1 + cp -rv usr/include/* /tools/include >> ${logfile} 2>&1 msg_success popd > /dev/null 2>&1 popd > /dev/null 2>&1 @@ -252,8 +251,8 @@ function Linux-API-Headers { return } function Glibc { - # Glibc-2.29 - local pkg=glibc-2.29.tar.xz + # Glibc-2.31 + local pkg=glibc-2.31.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -292,8 +291,8 @@ function Glibc { return } function Libstdc { - # Libstdc++ from GCC-8.2.0 - local pkg=gcc-8.2.0.tar.xz + # Libstdc++ from GCC-9.2.0 + local pkg=gcc-9.2.0.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -311,7 +310,7 @@ function Libstdc { --disable-nls \ --disable-libstdcxx-threads \ --disable-libstdcxx-pch \ - --with-gxx-include-dir=/tools/${LFS_TGT}/include/c++/8.2.0 >> ${logfile} 2>&1 + --with-gxx-include-dir=/tools/${LFS_TGT}/include/c++/9.2.0 >> ${logfile} 2>&1 msg_success msg_line " Make: " make ${MKFLAGS} >> ${logfile} 2>&1 @@ -327,8 +326,8 @@ function Libstdc { return } function Binutils-Pass-2 { - # Binutils-2.32 - Pass 2 - local pkg=binutils-2.32.tar.xz + # Binutils-2.34 - Pass 2 + local pkg=binutils-2.34.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -368,8 +367,8 @@ function Binutils-Pass-2 { return } function GCC-Pass-2 { - # GCC-8.2.0 - Pass 2 - local pkg=gcc-8.2.0.tar.xz + # GCC-9.2.0 - Pass 2 + local pkg=gcc-9.2.0.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -395,11 +394,12 @@ function GCC-Pass-2 { ;; esac unpack mpfr-4.0.2.tar.xz - unpack gmp-6.1.2.tar.xz + unpack gmp-6.2.0.tar.xz unpack mpc-1.1.0.tar.gz mv -v mpfr-4.0.2 mpfr >> ${logfile} 2>&1 - mv -v gmp-6.1.2 gmp >> ${logfile} 2>&1 + mv -v gmp-6.2.0 gmp >> ${logfile} 2>&1 mv -v mpc-1.1.0 mpc >> ${logfile} 2>&1 + sed -e '1161 s|^|//|' -i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc mkdir build pushd build >> /dev/null 2>&1 msg_line " Configure: " @@ -439,8 +439,8 @@ function GCC-Pass-2 { return } function Tcl { - # Tcl-8.6.9 - local pkg=tcl8.6.9-src.tar.gz + # Tcl-8.6.10 + local pkg=tcl8.6.10-src.tar.gz local pkg_dir=${pkg%%-src*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -549,8 +549,8 @@ function M4 { return } function Ncurses { - # Ncurses-6.1 - local pkg=ncurses-6.1.tar.gz + # Ncurses-6.2 + local pkg=ncurses-6.2.tar.gz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -608,8 +608,8 @@ function Bash { return } function Bison { - # Bison-3.3.2 - local pkg=bison-3.3.2.tar.xz + # Bison-3.5.2 + local pkg=bison-3.5.2.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -633,8 +633,8 @@ function Bison { return } function Bzip { - # Bzip2-1.0.6 - local pkg=bzip2-1.0.6.tar.gz + # Bzip2-1.0.8 + local pkg=bzip2-1.0.8.tar.gz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" local OPTFLAGS=" -march=x86-64 -mtune=generic -O2 -pipe -fPIC " @@ -644,14 +644,17 @@ function Bzip { unpack "${pkg}" pushd ${pkg_dir} >> /dev/null 2>&1 msg_line " Configure: " - sed -i "s|-O2|${OPTFLAGS}|g" Makefile - sed -i "s|-O2|${OPTFLAGS}|g" Makefile-libbz2_so + make ${MKFLAGS} -f Makefile-libbz2_so >> ${logfile} 2>&1 + make ${MKFLAGS} clean >> ${logfile} 2>&1 msg_success msg_line " Make: " make ${MKFLAGS} >> ${logfile} 2>&1 msg_success msg_line " Install: " make PREFIX=/tools install >> ${logfile} 2>&1 + cp -v bzip2-shared /tools/bin/bzip2 >> ${logfile} 2>&1 + cp -av libbz2.so* /tools/lib >> ${logfile} 2>&1 + ln -sv libbz2.so.1.0 /tools/lib/libbz2.so >> ${logfile} 2>&1 msg_success popd > /dev/null 2>&1 popd > /dev/null 2>&1 @@ -660,8 +663,8 @@ function Bzip { return } function Coreutils { - # Coreutils-8.30 - local pkg=coreutils-8.30.tar.xz + # Coreutils-8.31 + local pkg=coreutils-8.31.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -710,8 +713,8 @@ function Diffutils { return } function File { - # File-5.35 - local pkg=file-5.36.tar.gz + # File-5.38 + local pkg=file-5.38.tar.gz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -735,8 +738,8 @@ function File { return } function Findutils { - # Findutils-4.6.0 - local pkg=findutils-4.6.0.tar.gz + # Findutils-4.7.0 + local pkg=findutils-4.7.0.tar.gz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -744,9 +747,6 @@ function Findutils { pushd ${TOPDIR}/BUILD >> /dev/null 2>&1 unpack "${pkg}" pushd ${pkg_dir} >> /dev/null 2>&1 - sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' gl/lib/*.c - sed -i '/unistd/a #include ' gl/lib/mountlist.c - echo "#define _IO_IN_BACKUP 0x100" >> gl/lib/stdio-impl.h msg_line " Configure: " ./configure --prefix=/tools >> ${logfile} 2>&1 msg_success @@ -763,8 +763,8 @@ function Findutils { return } function Gawk { - # Gawk-4.2.1 - local pkg=gawk-4.2.1.tar.xz + # Gawk-5.0.1 + local pkg=gawk-5.0.1.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -788,8 +788,8 @@ function Gawk { return } function Gettext { - # Gettext-0.19.8.1 - local pkg=gettext-0.19.8.1.tar.xz + # Gettext-0.20.1 + local pkg=gettext-0.20.1.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -799,17 +799,13 @@ function Gettext { pushd ${pkg_dir} >> /dev/null 2>&1 cd gettext-tools > /dev/null 2>&1 msg_line " Configure: " - EMACS="no" ./configure --prefix=/tools --disable-shared >> ${logfile} 2>&1 + ./configure --disable-shared >> ${logfile} 2>&1 msg_success msg_line " Make: " - make ${MKFLAGS} -C gnulib-lib >> ${logfile} 2>&1 - make ${MKFLAGS} -C intl pluralx.c >> ${logfile} 2>&1 - make ${MKFLAGS} -C src msgfmt >> ${logfile} 2>&1 - make ${MKFLAGS} -C src msgmerge >> ${logfile} 2>&1 - make ${MKFLAGS} -C src xgettext >> ${logfile} 2>&1 + make ${MKFLAGS} >> ${logfile} 2>&1 msg_success msg_line " Install: " - cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin >> ${logfile} 2>&1 + cp -v gettext-tools/src/{msgfmt,msgmerge,xgettext} /tools/bin >> ${logfile} 2>&1 msg_success cd - > /dev/null 2>&1 popd > /dev/null 2>&1 @@ -819,8 +815,8 @@ function Gettext { return } function Grep { - # Grep-3.3 - local pkg=grep-3.3.tar.xz + # Grep-3.4 + local pkg=grep-3.4.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -869,8 +865,8 @@ function Gzip { return } function Make { - # Make-4.2.1 - local pkg=make-4.2.1.tar.bz2 + # Make-4.3 + local pkg=make-4.3.tar.bz2 local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -879,7 +875,6 @@ function Make { unpack "${pkg}" pushd ${pkg_dir} >> /dev/null 2>&1 msg_line " Configure: " - sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c ./configure --prefix=/tools --without-guile >> ${logfile} 2>&1 msg_success msg_line " Make: " @@ -920,9 +915,8 @@ function Patch { return } function Perl { - # Perl-5.28.1 - local pkg=perl-5.28.1.tar.xz -# local pkg=perl-5.26.1.tar.xz + # Perl-5.30.1 + local pkg=perl-5.30.1.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -934,13 +928,12 @@ function Perl { sh Configure -des -Dprefix=/tools -Dlibs=-lm -Uloclibpth -Ulocincpth >> ${logfile} 2>&1 msg_success msg_line " Make: " - # ulimit -s unlimited make ${MKFLAGS} >> ${logfile} 2>&1 msg_success msg_line " Install: " cp -v perl cpan/podlators/scripts/pod2man /tools/bin >> ${logfile} 2>&1 - mkdir -pv /tools/lib/perl5/5.28.1 >> ${logfile} 2>&1 - cp -Rv lib/* /tools/lib/perl5/5.28.1 >> ${logfile} 2>&1 + mkdir -pv /tools/lib/perl5/5.30.1 >> ${logfile} 2>&1 + cp -Rv lib/* /tools/lib/perl5/5.30.1 >> ${logfile} 2>&1 msg_success popd > /dev/null 2>&1 popd > /dev/null 2>&1 @@ -949,8 +942,8 @@ function Perl { return } function Python { - # Python-3.7.2 - local pkg=Python-3.7.2.tar.xz + # Python-3.8.1 + local pkg=Python-3.8.1.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -975,8 +968,8 @@ function Python { return } function Sed { - # Sed-4.7 - local pkg=sed-4.7.tar.xz + # Sed-4.8 + local pkg=sed-4.8.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -1000,8 +993,8 @@ function Sed { return } function Tar { - # Tar-1.31 - local pkg=tar-1.31.tar.xz + # Tar-1.32 + local pkg=tar-1.32.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -1025,8 +1018,8 @@ function Tar { return } function Texinfo { - # Texinfo-6.5 - local pkg=texinfo-6.5.tar.xz + # Texinfo-6.7 + local pkg=texinfo-6.7.tar.xz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -1138,7 +1131,7 @@ function Popt { return } function Openssl { - local pkg=openssl-1.1.1a.tar.gz + local pkg=openssl-1.1.1d.tar.gz local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -1172,7 +1165,7 @@ function Openssl { return } function Libelf { - local pkg=elfutils-0.176.tar.bz2 + local pkg=elfutils-0.178.tar.bz2 local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -1184,6 +1177,7 @@ function Libelf { msg_line " Configure: " ./configure \ --prefix=/tools \ + --disable-debuginfod \ --program-prefix="eu-" \ --disable-shared \ --enable-static >> ${logfile} 2>&1 @@ -1203,7 +1197,7 @@ function Libelf { return } function Rpm { - local pkg=rpm-4.14.2.1.tar.bz2 + local pkg=rpm-4.15.1.tar.bz2 local pkg_dir=${pkg%%.tar*} local logfile="${TOPDIR}/LOGS/tools-${FUNCNAME}.log" [ -e ${logfile}.complete ] && { msg "Skipping: ${FUNCNAME}";return 0; } || msg "Building: ${FUNCNAME}" @@ -1211,10 +1205,10 @@ function Rpm { pushd ${TOPDIR}/BUILD >> /dev/null 2>&1 unpack "${pkg}" pushd ${pkg_dir} >> /dev/null 2>&1 - unpack db-6.0.20.tar.gz + unpack db-5.3.28.tar.gz msg_line " Configure: " sed -i 's/--srcdir=$db_dist/--srcdir=$db_dist --with-pic/' db3/configure - ln -vs db-6.0.20 db >> ${logfile} 2>&1 + ln -vs db-5.3.28 db >> ${logfile} 2>&1 ./configure \ --prefix=/tools \ --program-prefix= \