From 47125bb8cf8c598202c11572d559960cb2b156bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 9 Feb 2019 12:29:45 +0100
Subject: [PATCH] cross-aarch64-linux-gnu: update to glibc-2.29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 srcpkgs/cross-aarch64-linux-gnu/template | 25 +++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index ad639829118..e302e5a86be 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -2,7 +2,7 @@
 #
 _binutils_version=2.32
 _gcc_version=8.2.0
-_glibc_version=2.28
+_glibc_version=2.29
 _linux_version=4.19
 
 _triplet=aarch64-linux-gnu
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.29
-revision=2
+revision=3
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,15 +23,15 @@ distfiles="
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
  196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
- b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082
+ f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="perl flex gcc-ada libada-devel"
-makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
+hostmakedepends="flex gcc-ada libada-devel perl python3"
+makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -134,9 +134,11 @@ _glibc_headers() {
 	[ -f ${wrksrc}/.glibc_headers_done ] && return 0
 
 	cd ${wrksrc}/glibc-${_glibc_version}
-	for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do
-		_apply_patch -p1 "$f"
-	done
+	if [ -d "${XBPS_SRCPKGDIR}/glibc/patches" ]; then
+		for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do
+			_apply_patch -p1 "$f"
+		done
+	fi
 
 	cd ${wrksrc}
 	msg_normal "Building cross glibc headers\n"
@@ -181,14 +183,15 @@ _glibc_build() {
 	echo "libc_cv_forced_unwind=yes" > config.cache
 	echo "libc_cv_c_cleanup=yes" >> config.cache
 
-	export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+	export CC="${_triplet}-gcc" CXX="${_triplet}-g++" LD="${_triplet}-ld" \
 		AS="${_triplet}-as" CPP="${_triplet}-cpp" \
 		NM="${_triplet}-nm"
-	export CFLAGS="-Os -pipe -Wno-error ${_archflags}"
+	export CFLAGS="-O1 -pipe -Wno-error ${_archflags}"
 
 	_args="--prefix=/usr"
 	_args+=" --libdir=/usr/lib"
 	_args+=" --host=${_triplet}"
+	_args+=" --target=${_triplet}"
 	_args+=" --with-headers=${_sysroot}/usr/include"
 	_args+=" --config-cache"
 	_args+=" --enable-obsolete-rpc"
@@ -215,7 +218,7 @@ _gcc_build() {
 	[ ! -d gcc-build ] && mkdir gcc-build
 	cd gcc-build
 
-	export CC="gcc" CFLAGS="-Os -pipe"
+	export CC="gcc" CXX="g++" CFLAGS="-Os -pipe"
 	unset LD AS
 
 	# Make this link to target libs.