From 4d967406e0349f77fbab29553bf2fc3d1a9fb7e2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 6 Aug 2016 21:21:33 +0200
Subject: [PATCH] AVR binutils: update to 2.26.1

Must match the host version of binutils.
---
 ... => avr_binutils-2.26.1_2016_07_22.recipe} | 55 +++++++++++++------
 1 file changed, 39 insertions(+), 16 deletions(-)
 rename sys-devel/avr_binutils/{avr_binutils-2.24_2014_03_19.recipe => avr_binutils-2.26.1_2016_07_22.recipe} (71%)

diff --git a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe b/sys-devel/avr_binutils/avr_binutils-2.26.1_2016_07_22.recipe
similarity index 71%
rename from sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
rename to sys-devel/avr_binutils/avr_binutils-2.26.1_2016_07_22.recipe
index 29465886a..dfefe25b8 100644
--- a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/avr_binutils/avr_binutils-2.26.1_2016_07_22.recipe
@@ -1,17 +1,35 @@
 SUMMARY="Assembler, linker and binary tools for Atmel AVR"
+DESCRIPTION="The GNU Binutils are a collection of binary tools.
+
+The main ones are:
+- ld - the GNU linker.
+- as - the GNU assembler.
+
+But they also include:
+- addr2line - converts addresses into filenames and line numbers.
+- ar - a utility for creating, modifying and extracting of archives.
+- c++filt - filter to demangle encoded C++ symbols.
+- nm - lists symbols from object files.
+- objcopy - copys and translates object files.
+- objdump - displays information from object files.
+- ranlib - generates an index to the contents of an archive.
+- readelf - displays information from any ELF format object file.
+- size - lists the section sizes of an object or archive file.
+- strings - lists printable strings from files.
+- strip - discards symbols.
+
+The tools of this package can be used for cross-builds to \
+$effectiveTargetMachineTriple."
 HOMEPAGE="http://www.gnu.org/software/binutils"
-
-srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
+COPYRIGHT="1988-2016 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+REVISION="1"
+srcGitRev="68e96393c7be88bc0e577404869a07ad3c0b48b3"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+CHECKSUM_SHA256="5f14f68a76035a04d15b1a3e9ba5bbd990b1b380b110b93cb33355142dca8f9c"
+SOURCE_DIR="buildtools-$srcGitRev/binutils"
 SOURCE_FILENAME="binutils-$portVersion.tar.gz"
-REVISION="5"
-LICENSE="
-	GNU GPL v2
-	GNU LGPL v2
-	"
-COPYRIGHT="1988-2013 Free Software Foundation, Inc."
-
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86"
@@ -34,19 +52,21 @@ PROVIDES="
 	cmd:avr_size$secondaryArchSuffix = $portVersion compat >= 2.23
 	cmd:avr_strings$secondaryArchSuffix = $portVersion compat >= 2.23
 	cmd:avr_strip$secondaryArchSuffix = $portVersion compat >= 2.23
-	lib:avr_libbfd_2.24$secondaryArchSuffix = $portVersion compat >= 2.23
-	lib:avr_libopcodes_2.24$secondaryArchSuffix = $portVersion compat >= 2.23
+	lib:avr_libbfd_2.26.1$secondaryArchSuffix = $portVersion compat >= 2.23
+	lib:avr_libopcodes_2.26.1$secondaryArchSuffix = $portVersion compat >= 2.23
 	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libbfd_2.26.1$secondaryArchSuffix
+	lib:libopcodes_2.26.1$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	cmd:find
 	cmd:xargs
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
@@ -61,7 +81,6 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-SOURCE_DIR="buildtools-$srcGitRev/binutils"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 sourceDir=$(pwd)
@@ -76,16 +95,20 @@ BUILD()
 	# Touch all *.info files, as newer texinfos don't like their format
 	(cd $sourceDir; find . -name \*.info | xargs touch)
 
+	(cd $sourceDir; find . -name \*.y | sed 's/.y$/.c/g' | xargs touch)
+    (cd $sourceDir; find . -name \*.y | sed 's/.y$/.h/g' | xargs touch)
+
 	mkdir -p $objectsDir
 	cd $objectsDir
 
 	CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \
 		--exec-prefix=$installDir \
 		--includedir=$includeDir/binutils \
-		--docdir=$docDir \
+		--docdir=$docDir --with-sysroot=$installDir \
+		--enable-deterministic-archives --enable-shared=yes \
 		--disable-nls --target=avr
 
-	make $jobArgs
+	make $jobArgs LEXLIB=
 }
 
 INSTALL()