From 16632d63a749af68f868c7f706c9df2869f1a55c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 19 Nov 2014 21:02:27 +0100
Subject: [PATCH] arm_none_eabi_gdb: fixup recipe.

---
 .../arm_none_eabi_gdb-7.7.recipe              | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
index f7ce6a408..1cd086123 100644
--- a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
+++ b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
@@ -29,42 +29,50 @@ REVISION="1"
 
 PATCHES="gdb-7.7.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES=""
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	arm_none_eabi_gdb = $portVersion
-	cmd:arm_none_eabi_gdb = $portVersion
+	arm_none_eabi_gdb$secondaryArchSuffix = $portVersion
+	cmd:arm_none_eabi_gdb$secondaryArchSuffix
+	cmd:arm_none_eabi_run$secondaryArchSuffix
+	devel:libarm_none_eabi_sim$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libiconv
-	lib:libintl
-	lib:libncurses
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	gettext
-	libiconv_devel
-	ncurses_devel
+	gettext$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:autoreconf
 	cmd:awk
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
 	cd gdb && autoreconf; cd ..
-	runConfigure ./configure --target=arm-none-eabi
+	runConfigure ./configure --target=arm-none-eabi --disable-werror
 	make $jobArgs
 }
 
@@ -72,7 +80,6 @@ INSTALL()
 {
 	make install
 	mkdir -p /packaging/gdb/develop/lib
-	for i in libbfd.a libbfd.la libopcodes.a libopcodes.la; do
-		mv /packaging/gdb/lib/$i /packaging/gdb/develop/lib/$i
-	done
+	prepareInstalledDevelLib libarm-none-eabi-sim
+	rm -r $prefix/share # Locales end up there for some reason?
 }