From a5b5f5735dba67f2182ee612fbbe522888f0471f Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Fri, 10 Dec 2021 11:45:31 +0100
Subject: [PATCH] cross/binutils-*: upgrade to 2.37-r4

---
 cross/binutils-aarch64/APKBUILD | 10 +++++++++-
 cross/binutils-armhf/APKBUILD   | 10 +++++++++-
 cross/binutils-armv7/APKBUILD   | 10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD
index 64cf31970..edfe352f1 100644
--- a/cross/binutils-aarch64/APKBUILD
+++ b/cross/binutils-aarch64/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=binutils-aarch64
 pkgver=2.37
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -42,6 +42,14 @@ fi
 #   2.28-r1:
 #     - CVE-2017-7614
 
+prepare() {
+	default_prepare
+
+	# Remove existing empty man pages to force them to be regenerated.
+	# Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+	find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
 build() {
 	_target="$(arch_to_hostspec aarch64)"
 	"$builddir"/configure \
diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD
index c8e3675eb..532238d01 100644
--- a/cross/binutils-armhf/APKBUILD
+++ b/cross/binutils-armhf/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=binutils-armhf
 pkgver=2.37
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -42,6 +42,14 @@ fi
 #   2.28-r1:
 #     - CVE-2017-7614
 
+prepare() {
+	default_prepare
+
+	# Remove existing empty man pages to force them to be regenerated.
+	# Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+	find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
 build() {
 	_target="$(arch_to_hostspec armhf)"
 	"$builddir"/configure \
diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD
index 933b550b2..9ec42c5ce 100644
--- a/cross/binutils-armv7/APKBUILD
+++ b/cross/binutils-armv7/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=binutils-armv7
 pkgver=2.37
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -42,6 +42,14 @@ fi
 #   2.28-r1:
 #     - CVE-2017-7614
 
+prepare() {
+	default_prepare
+
+	# Remove existing empty man pages to force them to be regenerated.
+	# Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+	find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
 build() {
 	_target="$(arch_to_hostspec armv7)"
 	"$builddir"/configure \