# HG changeset patch # User Christophe Lincoln # Date 1399660739 -7200 # Node ID 0bfd04c900d5c415bd581d45828e6855c0fc4da2 # Parent b7bc9f049215c6c5aea9423709ba6fa6c8c25570 Various fixes to cross (building cross toolchain should go smoother) and update Eglibc to 2.14.1 (match glibc) diff -r b7bc9f049215 -r 0bfd04c900d5 cross --- a/cross Fri May 09 11:59:51 2014 +0200 +++ b/cross Fri May 09 20:38:59 2014 +0200 @@ -16,7 +16,6 @@ tools=$WORK/tools sysroot=$WORK/sysroot logdir=$WORK/log -mirror_url="http://mirror.slitaz.org/packages/cross/" # Cross-tools tarballs binutils_tarball="binutils-$BINUTILS_VERSION.tar.bz2" @@ -30,7 +29,8 @@ binutils_wget="http://ftp.gnu.org/gnu/binutils/$binutils_tarball" linux_wget="http://www.kernel.org/pub/linux/kernel/v3.x/$linux_tarball" glibc_wget="http://ftp.gnu.org/gnu/libc/$glibc_tarball" -eglibc_wget="svn://svn.eglibc.org/branches/eglibc-2_13" +eglibc_wget="http://mirror.slitaz.org/arm/src/$eglibc_tarball" +eglibc_svn="svn://svn.eglibc.org/branches/eglibc-2_14" gcc_wget="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VERSION/$gcc_tarball" libtool_wget="ftp://sunsite.cnlab-switch.ch/mirror/gnu/libtool/$libtool_tarball" @@ -110,8 +110,9 @@ download_src() { mkdir -p $SRC && cd $SRC [ -f "$binutils_tarball" ] || wget $binutils_wget - [ -f "$linux_tarball" ] || wget $linux_wget + [ -f "$linux_tarball" ] || wget --no-check-certificate $linux_wget [ -f "$glibc_tarball" ] || wget $glibc_wget + [ -f "$eglibc_tarball" ] || wget $eglibc_wget [ -f "$gcc_tarball" ] || wget $gcc_wget [ -f "$libtool_tarball" ] || wget $libtool_wget } @@ -156,6 +157,7 @@ INSTALL_HDR_PATH=$source/linux-headers rm $source/linux-headers/include/.*install* echo "Copying headers to: $sysroot/usr" + mkdir -p $sysroot/usr cp -a $source/linux-headers/* $sysroot/usr } @@ -273,13 +275,17 @@ init_compile init_cflags rm -rf eglibc-build eglibc-$EGLIBC_VERSION + if [ ! -f "$SRC/$eglibc_tarball" ]; then + echo "Missing: $SRC/$eglibc_tarball" + exit 1 + fi echo "Extracting: $eglibc_tarball" tar xjf $SRC/$eglibc_tarball || exit 1 case "$ARCH" in arm*) if [ ! -d "$source/eglibc-ports-$EGLIBC_VERSION" ]; then - echo "Cloning $eglibc_wget/ports" - svn co $eglibc_wget/ports eglibc-ports-$EGLIBC_VERSION >/dev/null + echo "Cloning $eglibc_svn/ports" + svn co $eglibc_svn/ports eglibc-ports-$EGLIBC_VERSION >/dev/null fi cp -a eglibc-ports-$EGLIBC_VERSION eglibc-$EGLIBC_VERSION/ports libexec=/usr/lib/eglibc ;; @@ -318,7 +324,9 @@ --cache-file=config.cache \ $EGLIBC_ARGS && make || exit 1 - make install_root=$sysroot install + make install_root=$sysroot install || exit 1 + # Sep files for packaging + make install_root=$source/eglibc-install install || exit 1 echo "cross: eglibc compiled on: $(date)" } diff -r b7bc9f049215 -r 0bfd04c900d5 data/cross-arm.conf --- a/data/cross-arm.conf Fri May 09 11:59:51 2014 +0200 +++ b/data/cross-arm.conf Fri May 09 20:38:59 2014 +0200 @@ -13,8 +13,8 @@ # Cross-tools versions BINUTILS_VERSION="2.22" LINUX_VERSION="3.2.14" -GLIBC_VERSION="2.13" -EGLIBC_VERSION="2.13" +GLIBC_VERSION="2.14.1" +EGLIBC_VERSION="2.14.1" GCC_VERSION="4.6.3" LIBTOOL_VERSION="2.4.2" diff -r b7bc9f049215 -r 0bfd04c900d5 data/cross-armv6hf.conf --- a/data/cross-armv6hf.conf Fri May 09 11:59:51 2014 +0200 +++ b/data/cross-armv6hf.conf Fri May 09 20:38:59 2014 +0200 @@ -14,8 +14,8 @@ # Cross-tools versions BINUTILS_VERSION="2.22" LINUX_VERSION="3.2.14" -GLIBC_VERSION="2.13" -EGLIBC_VERSION="2.13" +GLIBC_VERSION="2.14.1" +EGLIBC_VERSION="2.14.1" GCC_VERSION="4.6.3" LIBTOOL_VERSION="2.4.2" diff -r b7bc9f049215 -r 0bfd04c900d5 data/cross-armv7.conf --- a/data/cross-armv7.conf Fri May 09 11:59:51 2014 +0200 +++ b/data/cross-armv7.conf Fri May 09 20:38:59 2014 +0200 @@ -14,8 +14,8 @@ # Cross-tools versions BINUTILS_VERSION="2.22" LINUX_VERSION="3.2.14" -GLIBC_VERSION="2.13" -EGLIBC_VERSION="2.13" +GLIBC_VERSION="2.14.1" +EGLIBC_VERSION="2.14.1" GCC_VERSION="4.6.3" LIBTOOL_VERSION="2.4.2"