cookutils diff cross @ rev 681

Various fixes to cross (building cross toolchain should go smoother) and update Eglibc to 2.14.1 (match glibc)
author Christophe Lincoln <pankso@slitaz.org>
date Fri May 09 20:38:59 2014 +0200 (2014-05-09)
parents b7bc9f049215
children f2cd25cd9120
line diff
     1.1 --- a/cross	Fri May 09 11:59:51 2014 +0200
     1.2 +++ b/cross	Fri May 09 20:38:59 2014 +0200
     1.3 @@ -16,7 +16,6 @@
     1.4  tools=$WORK/tools
     1.5  sysroot=$WORK/sysroot
     1.6  logdir=$WORK/log
     1.7 -mirror_url="http://mirror.slitaz.org/packages/cross/"
     1.8  
     1.9  # Cross-tools tarballs
    1.10  binutils_tarball="binutils-$BINUTILS_VERSION.tar.bz2"
    1.11 @@ -30,7 +29,8 @@
    1.12  binutils_wget="http://ftp.gnu.org/gnu/binutils/$binutils_tarball"
    1.13  linux_wget="http://www.kernel.org/pub/linux/kernel/v3.x/$linux_tarball"
    1.14  glibc_wget="http://ftp.gnu.org/gnu/libc/$glibc_tarball"
    1.15 -eglibc_wget="svn://svn.eglibc.org/branches/eglibc-2_13"
    1.16 +eglibc_wget="http://mirror.slitaz.org/arm/src/$eglibc_tarball"
    1.17 +eglibc_svn="svn://svn.eglibc.org/branches/eglibc-2_14"
    1.18  gcc_wget="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VERSION/$gcc_tarball"
    1.19  libtool_wget="ftp://sunsite.cnlab-switch.ch/mirror/gnu/libtool/$libtool_tarball"
    1.20  
    1.21 @@ -110,8 +110,9 @@
    1.22  download_src() {
    1.23  	mkdir -p $SRC && cd $SRC
    1.24  	[ -f "$binutils_tarball" ] || wget $binutils_wget
    1.25 -	[ -f "$linux_tarball" ] || wget $linux_wget
    1.26 +	[ -f "$linux_tarball" ] || wget --no-check-certificate $linux_wget
    1.27  	[ -f "$glibc_tarball" ] || wget $glibc_wget
    1.28 +	[ -f "$eglibc_tarball" ] || wget $eglibc_wget
    1.29  	[ -f "$gcc_tarball" ] || wget $gcc_wget
    1.30  	[ -f "$libtool_tarball" ] || wget $libtool_wget
    1.31  }
    1.32 @@ -156,6 +157,7 @@
    1.33  		INSTALL_HDR_PATH=$source/linux-headers
    1.34  	rm  $source/linux-headers/include/.*install*
    1.35  	echo "Copying headers to: $sysroot/usr"
    1.36 +	mkdir -p $sysroot/usr
    1.37  	cp -a $source/linux-headers/* $sysroot/usr
    1.38  }
    1.39  
    1.40 @@ -273,13 +275,17 @@
    1.41  	init_compile
    1.42  	init_cflags
    1.43  	rm -rf eglibc-build eglibc-$EGLIBC_VERSION
    1.44 +	if [ ! -f "$SRC/$eglibc_tarball" ]; then
    1.45 +		echo "Missing: $SRC/$eglibc_tarball"
    1.46 +		exit 1
    1.47 +	fi
    1.48  	echo "Extracting: $eglibc_tarball"
    1.49  	tar xjf $SRC/$eglibc_tarball || exit 1
    1.50  	case "$ARCH" in
    1.51  		arm*)
    1.52  			if [ ! -d "$source/eglibc-ports-$EGLIBC_VERSION" ]; then
    1.53 -				echo "Cloning $eglibc_wget/ports"
    1.54 -				svn co $eglibc_wget/ports eglibc-ports-$EGLIBC_VERSION >/dev/null
    1.55 +				echo "Cloning $eglibc_svn/ports"
    1.56 +				svn co $eglibc_svn/ports eglibc-ports-$EGLIBC_VERSION >/dev/null
    1.57  			fi
    1.58  			cp -a eglibc-ports-$EGLIBC_VERSION eglibc-$EGLIBC_VERSION/ports
    1.59  			libexec=/usr/lib/eglibc ;;
    1.60 @@ -318,7 +324,9 @@
    1.61  		--cache-file=config.cache \
    1.62  		$EGLIBC_ARGS &&
    1.63  	make || exit 1
    1.64 -	make install_root=$sysroot install
    1.65 +	make install_root=$sysroot install || exit 1
    1.66 +	# Sep files for packaging
    1.67 +	make install_root=$source/eglibc-install install || exit 1
    1.68  	echo "cross: eglibc compiled on: $(date)"
    1.69  }
    1.70