From 37123b4fdbed1942f8cc1f6f8e7423d194213982 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 6 Nov 2019 22:45:24 +0100
Subject: [PATCH] device/linux-htc-bravo: fix build with new binutils

---
 ...Makefile-fix-build-with-new-binutils.patch | 29 +++++++++++++++++++
 device/linux-htc-bravo/APKBUILD               |  6 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 device/linux-htc-bravo/0001-Makefile-fix-build-with-new-binutils.patch

diff --git a/device/linux-htc-bravo/0001-Makefile-fix-build-with-new-binutils.patch b/device/linux-htc-bravo/0001-Makefile-fix-build-with-new-binutils.patch
new file mode 100644
index 000000000..ca4d9dd27
--- /dev/null
+++ b/device/linux-htc-bravo/0001-Makefile-fix-build-with-new-binutils.patch
@@ -0,0 +1,29 @@
+From 1438b6973b3cb8ed3f0bd726edf51354eec40149 Mon Sep 17 00:00:00 2001
+From: Luca Weiss <luca@z3ntu.xyz>
+Date: Wed, 6 Nov 2019 22:44:03 +0100
+Subject: [PATCH] Makefile: fix build with new binutils
+
+Recent binutils complain when the linker script is passed multiple
+times, which is the case here:
+
+error: linker script file '/<cut>/scripts/module-common.lds' appears multiple times
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5732638bf57..930acff3dcf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -360,7 +360,7 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
+ MODFLAGS	= -DMODULE -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -ffast-math -fsingle-precision-constant
+ CFLAGS_MODULE   = $(MODFLAGS)
+ AFLAGS_MODULE   = $(MODFLAGS) -pipe
+-LDFLAGS_MODULE  = -T $(srctree)/scripts/module-common.lds
++LDFLAGS_MODULE  =
+ CFLAGS_KERNEL	= -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -ffast-math -fsingle-precision-constant
+ AFLAGS_KERNEL	= -march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -ffast-math -fsingle-precision-constant -pipe
+ CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage
+-- 
+2.24.0
+
diff --git a/device/linux-htc-bravo/APKBUILD b/device/linux-htc-bravo/APKBUILD
index 964290252..fda7c67f7 100644
--- a/device/linux-htc-bravo/APKBUILD
+++ b/device/linux-htc-bravo/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-htc-bravo"
 pkgver=3.0.16
-pkgrel=10
+pkgrel=11
 pkgdesc="HTC Desire kernel from spezi77"
 arch="armhf"
 _carch="arm"
@@ -29,6 +29,7 @@ source="
 	$pkgname-$_commit.tar.gz::https://github.com/spezi77/${_repository}/archive/${_commit}.tar.gz
 	$_config
 	compiler-gcc6.h
+	0001-Makefile-fix-build-with-new-binutils.patch
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
@@ -58,4 +59,5 @@ package() {
 
 sha512sums="94929945d6fcb4428f320325ced207a9888cd758357766ef914c4ca2d5cea4b9cced77275463dac316591ba942e6e1514fec8c1f8e11c8324155116785ffb277  linux-htc-bravo-4bc19919f805777947c243e6c2ed41ece530488b.tar.gz
 49460380237b391b9e0b79e3bad3ff65ea423a8ed0790501ae4c69652ff0799f21fa639bcb14014df81b5bbe361d0bf4665233d562d84047598bfca51b16dfc4  config-htc-bravo.armhf
-d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h"
+d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
+d287d21a02c8ec299619db7cd4e5f8669dc3107cd13c4d918a656a6d410d7cfa0d2fdfa3a4bd7b52982698e93ad63052cbc3be20c451ef224331bf325af9f813  0001-Makefile-fix-build-with-new-binutils.patch"