From 205450a91ad01c849282d4c2c3ea97e1c783cb8d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 27 Jun 2015 08:24:46 +0200
Subject: [PATCH] cross-aarch64-linux-gnu: update gcc to 4.9.3; sync with other
 cross pkgs.

---
 srcpkgs/cross-aarch64-linux-gnu/template | 84 +++++++++++-------------
 1 file changed, 38 insertions(+), 46 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 879d28a8c0..c09fd57b3d 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,17 +1,17 @@
 # Template build file for 'cross-aarch64-linux-gnu'
 #
 _binutils_version=2.25
-_gcc_version=4.9.2
+_gcc_version=4.9.3
 _glibc_version=2.21
 _linux_version=3.14.34
 
 _triplet=aarch64-linux-gnu
 _archflags="-march=armv8-a"
-_CROSS_SYSROOT="/usr/${_triplet}"
+_sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.19
-revision=3
+version=0.20
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 homepage="http://www.voidlinux.eu"
@@ -21,8 +21,9 @@ distfiles="
  ${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
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+checksum="
+ 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8
  041e2a65565dc93bb5f64422c56d3ca11057b0a2ac2287f04fe9ee9aa1ae0da2"
 
@@ -53,7 +54,7 @@ _linux_headers() {
 	cd linux-${_linux_version}
 
 	make ARCH=arm64 headers_check
-	make ARCH=arm64 INSTALL_HDR_PATH=${_CROSS_SYSROOT}/usr headers_install
+	make ARCH=arm64 INSTALL_HDR_PATH=${_sysroot}/usr headers_install
 
 	touch ${wrksrc}/.linux_build_done
 }
@@ -68,7 +69,7 @@ _binutils_build() {
 
 	../binutils-${_binutils_version}/configure \
 		--prefix=/usr --target=${_triplet} \
-		--with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \
+		--with-sysroot=${_sysroot} --disable-nls --disable-shared \
 		--disable-multilib --disable-werror --enable-gold
 
 	make configure-host && make ${makejobs}
@@ -121,13 +122,13 @@ _glibc_headers() {
 
 	../glibc-${_glibc_version}/configure \
 		--host=${_triplet} --prefix=/usr \
-		--with-headers=${_CROSS_SYSROOT}/usr/include \
+		--with-headers=${_sysroot}/usr/include \
 		--config-cache \
 		--enable-obsolete-rpc \
 		--enable-kernel=2.6.27
 
 	make -k install-headers cross_compiling=yes \
-		install_root=${_CROSS_SYSROOT}
+		install_root=${_sysroot}
 
 	touch ${wrksrc}/.glibc_headers_done
 }
@@ -151,13 +152,13 @@ _glibc_build() {
 
 	../glibc-${_glibc_version}/configure \
 		--host=${_triplet} --prefix=/usr --libdir=/usr/lib \
-		--with-headers=${_CROSS_SYSROOT}/usr/include \
+		--with-headers=${_sysroot}/usr/include \
 		--config-cache \
 		--enable-obsolete-rpc --disable-profile \
 		--enable-kernel=2.6.27
 
 	make ${makejobs}
-	make install_root=${_CROSS_SYSROOT} install
+	make install_root=${_sysroot} install
 
 	touch ${wrksrc}/.glibc_build_done
 }
@@ -176,16 +177,16 @@ _gcc_build() {
 
 	# Make this link to target libs.
 	if [ ! -f .sed_subst_done ]; then
-		sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \
-			-i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so
-		sed -e "s, /lib64/, ${_CROSS_SYSROOT}/lib64/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \
-			-i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so
+		sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \
+			-i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so
+		sed -e "s, /lib64/, ${_sysroot}/lib64/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \
+			-i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so
 		touch .sed_subst_done
 	fi
 
 	../gcc-${_gcc_version}/configure \
 		--target=${_triplet} --prefix=/usr --libdir=/usr/lib \
-		--with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \
+		--with-sysroot=${_sysroot} --enable-languages=c,c++,lto \
 		--with-gnu-as --with-gnu-ld --disable-multilib \
 		--disable-nls --disable-sjlj-exceptions \
 		--enable-threads=posix --enable-long-longx \
@@ -207,11 +208,11 @@ do_build() {
 	export CFLAGS="-Os" CXXFLAGS="-Os"
 
 	for f in include lib libexec bin sbin; do
-		if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then
-			mkdir -p ${_CROSS_SYSROOT}/usr/${f}
+		if [ ! -d ${_sysroot}/usr/${f} ]; then
+			mkdir -p ${_sysroot}/usr/${f}
 		fi
-		if [ ! -h ${_CROSS_SYSROOT}/${f} ]; then
-			ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f}
+		if [ ! -h ${_sysroot}/${f} ]; then
+			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
 
@@ -225,12 +226,12 @@ do_build() {
 
 do_install() {
 	for f in include lib libexec bin sbin; do
-		if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then
-			mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f}
+		if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
+			mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
 		fi
-		if [ ! -h ${DESTDIR}/${_CROSS_SYSROOT}/${f} ]; then
-			ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \
-				${DESTDIR}/${_CROSS_SYSROOT}/${f}
+		if [ ! -h ${DESTDIR}/${_sysroot}/${f} ]; then
+			ln -sfr ${DESTDIR}/${_sysroot}/usr/${f} \
+				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
 
@@ -244,13 +245,13 @@ do_install() {
 
 	# install linux API headers for ARM64
 	cd ${wrksrc}/linux-${_linux_version}
-	make ARCH=arm64 INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr headers_install
-	rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
-	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
+	make ARCH=arm64 INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install
+	rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd)
+	rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm
 
 	# install glibc for target
 	cd ${wrksrc}/glibc-build
-	make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
+	make install_root=${DESTDIR}/${_sysroot} install install-headers
 
 	# Move files to /usr/lib (lib64).
 	if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then
@@ -261,21 +262,15 @@ do_install() {
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
-	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{etc,var}
-	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec}
-	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/gconv
-	rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec
-
-	for f in sprof localedef gencat pldd sotruss tzselect iconv mtrace \
-		catchsegv xtrace makedb pcprofiledump locale rpcgen getconf \
-		getent ldd; do
-		rm -f ${DESTDIR}/${_CROSS_SYSROOT}/usr/bin/${f}
-	done
+	rm -rf ${DESTDIR}/${_sysroot}/{sbin,bin,lib,etc,var}
+	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
+	rm -rf ${DESTDIR}/${_sysroot}/usr/lib/gconv
+	rm -f ${DESTDIR}/${_sysroot}/libexec
 }
 
 do_clean() {
 	# Remove temporary stuff from masterdir
-	rm -rf ${_CROSS_SYSROOT}
+	rm -rf ${_sysroot}
 	rm -f /usr/bin/${_triplet}*
 	rm -rf /usr/lib/gcc/${_triplet}
 	rm -rf /usr/libexec/gcc/${_triplet}
@@ -284,13 +279,10 @@ do_clean() {
 cross-aarch64-linux-gnu-libc_package() {
 	short_desc+=" - glibc files"
 	noarch=yes
-	nostrip=yes
+	noshlibprovides=yes
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${_triplet}
-		mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
-		mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin \
-			${DESTDIR}/usr/${_triplet}/usr
+		vmove ${_sysroot}
 	}
 }