From 3180b2e4b3e19b2403ea33c6b6b09cbbd0a8520a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 31 Oct 2018 14:25:44 +0100
Subject: [PATCH] cross-arm-linux-gnueabihf: binutils-2.31.1 and gnat

[ci skip]
---
 srcpkgs/cross-arm-linux-gnueabihf/template | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d744cb8903e..2f5758b9f98 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,9 +1,9 @@
 # Template build file for 'cross-arm-linux-gnueabihf'
 #
-_binutils_version=2.29.1
+_binutils_version=2.31.1
 _gcc_version=8.2.0
 _glibc_version=2.28
-_linux_version=4.9.8
+_linux_version=4.19
 
 _triplet=arm-linux-gnueabihf
 _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
@@ -11,21 +11,21 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.28
+version=0.29
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://www.voidlinux.eu"
+homepage="https://www.voidlinux.org/"
 license="Public Domain"
 distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
-checksum="1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc
+checksum="5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86
  196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
  b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082
- 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
 nocross=yes
@@ -33,10 +33,11 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex"
+hostmakedepends="perl flex gcc-ada libada-devel"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a"
+nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
+ libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
 only_for_archs="i686 x86_64"
 
 _apply_patch() {
@@ -234,7 +235,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -246,6 +247,7 @@ _gcc_build() {
 	_args+=" --enable-shared"
 	_args+=" --enable-linker-build-id"
 	_args+=" --enable-gnu-unique-object"
+	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
@@ -323,6 +325,15 @@ do_install() {
 	cd ${wrksrc}/glibc-build
 	make install_root=${DESTDIR}/${_sysroot} install install-headers
 
+	# symlinks for gnarl and gnat shared libraries
+	_majorver=${_gcc_version%.*.*}
+	_adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
+	mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	ln -svf libgnarl-${_majorver}.so libgnarl.so
+	ln -svf libgnat-${_majorver}.so libgnat.so
+	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share