From f2f3c6661b2e122afc8ba8263423f120da394826 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 7 Jan 2021 01:43:31 +0100
Subject: [PATCH] build-style/void-cross: unify binutils options with template
 a bit

---
 common/build-style/void-cross.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 0e5c2336357..5b9076d7522 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -38,6 +38,17 @@ _void_cross_build_binutils() {
 
 	local ver=$1
 
+	msg_normal "Patching binutils for ${cross_triplet}\n"
+
+	cd ${wrksrc}/binutils-${ver}
+	# enable when crosstoolchains are updated to latest binutils
+	#if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then
+	#	for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do
+	#		_void_cross_apply_patch -p1 "$f"
+	#	done
+	#fi
+	cd ..
+
 	msg_normal "Building binutils for ${cross_triplet}\n"
 
 	mkdir -p ${wrksrc}/binutils_build
@@ -55,9 +66,13 @@ _void_cross_build_binutils() {
 		--disable-multilib \
 		--disable-werror \
 		--disable-gold \
-		--with-system-zlib \
+		--enable-relro \
+		--enable-64-bit-bfd \
 		--enable-deterministic-archives \
 		--enable-default-hash-style=gnu \
+		--with-system-zlib \
+		--with-mmap \
+		--with-pic \
 		${cross_binutils_configure_args}
 
 	make configure-host