From ebaa1b98552562fe71a94c989328f9012697bbec Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Tue, 19 Jan 2016 18:43:44 +0100
Subject: [PATCH] cross-i686-pc-linux-gnu: update to 0.21.

- Do not remove SYSROOT/bin symlink.
- Update binutils, glibc/musl and linux headers.
- Sensible licenses=.
---
 srcpkgs/cross-i686-pc-linux-gnu/template | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 4d47b7133c6..8780528e97c 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,31 +1,30 @@
 # Template build file for 'cross-i686-pc-linux-gnu'
 #
-_binutils_version=2.25
+_binutils_version=2.25.1
 _gcc_version=4.9.3
-_glibc_version=2.21
-_linux_version=3.18.5
+_glibc_version=2.22
+_linux_version=3.18.25
 
 _triplet=i686-pc-linux-gnu
 _archflags="-march=i686 -mtune=generic"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.20
+version=0.21
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
-license="Public Domain"
+license="GPL-3, GPL-2, LGPL-2.1"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz"
-checksum="
- 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
+checksum="b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22
  2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
- aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8
- e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90"
+ eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948
+ c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92"
 
 only_for_archs="armv6l armv7l x86_64"
 nocross=yes
@@ -258,7 +257,7 @@ do_install() {
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
-	rm -rf ${DESTDIR}/${_sysroot}/{sbin,bin,lib,etc,var}
+	rm -rf ${DESTDIR}/${_sysroot}/{sbin,lib,etc,var}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/lib/gconv
 	rm -f ${DESTDIR}/${_sysroot}/libexec