From c3d04920f6a9320641e7af02c62d9246c23e1eaa Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Thu, 7 Apr 2016 11:14:45 +0200
Subject: [PATCH] binutils: install libiberty, upstream FS#1306

---
 binutils/.footprint | 16 +++++++++++++++-
 binutils/Pkgfile    |  5 ++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/binutils/.footprint b/binutils/.footprint
index c332639..aaa6b07 100644
--- a/binutils/.footprint
+++ b/binutils/.footprint
@@ -23,7 +23,20 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/bfd.h
 -rw-r--r--	root/root	usr/include/bfdlink.h
 -rw-r--r--	root/root	usr/include/dis-asm.h
--rw-r--r--	root/root	usr/include/libiberty.h
+drwxr-xr-x	root/root	usr/include/libiberty/
+-rw-r--r--	root/root	usr/include/libiberty/ansidecl.h
+-rw-r--r--	root/root	usr/include/libiberty/demangle.h
+-rw-r--r--	root/root	usr/include/libiberty/dyn-string.h
+-rw-r--r--	root/root	usr/include/libiberty/fibheap.h
+-rw-r--r--	root/root	usr/include/libiberty/floatformat.h
+-rw-r--r--	root/root	usr/include/libiberty/hashtab.h
+-rw-r--r--	root/root	usr/include/libiberty/libiberty.h
+-rw-r--r--	root/root	usr/include/libiberty/objalloc.h
+-rw-r--r--	root/root	usr/include/libiberty/partition.h
+-rw-r--r--	root/root	usr/include/libiberty/safe-ctype.h
+-rw-r--r--	root/root	usr/include/libiberty/sort.h
+-rw-r--r--	root/root	usr/include/libiberty/splay-tree.h
+-rw-r--r--	root/root	usr/include/libiberty/timeval-utils.h
 -rw-r--r--	root/root	usr/include/plugin-api.h
 -rw-r--r--	root/root	usr/include/symcat.h
 drwxr-xr-x	root/root	usr/lib/
@@ -58,6 +71,7 @@ drwxr-xr-x	root/root	usr/lib/ldscripts/
 -rw-r--r--	root/root	usr/lib/libbfd.a
 -rwxr-xr-x	root/root	usr/lib/libbfd.la
 lrwxrwxrwx	root/root	usr/lib/libbfd.so -> libbfd-2.25.1.so
+-rw-r--r--	root/root	usr/lib/libiberty.a
 -rwxr-xr-x	root/root	usr/lib/libopcodes-2.25.1.so
 -rw-r--r--	root/root	usr/lib/libopcodes.a
 -rwxr-xr-x	root/root	usr/lib/libopcodes.la
diff --git a/binutils/Pkgfile b/binutils/Pkgfile
index 174907c..58b3ad9 100644
--- a/binutils/Pkgfile
+++ b/binutils/Pkgfile
@@ -6,7 +6,7 @@
 
 name=binutils
 version=2.25.1
-release=2
+release=3
 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)
 
 build() {
@@ -22,13 +22,12 @@ build() {
                               --enable-ld=default \
                               --enable-gold=yes \
                               --enable-plugins \
+                              --enable-install-libiberty \
                               --disable-werror
 
   make tooldir=/usr
   make tooldir=/usr DESTDIR=$PKG install
 
-  install -m 0644  ../$name-$version/include/libiberty.h $PKG/usr/include
-
   rm -r $PKG/usr/share/info
   rm $PKG/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}.1
   sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/lib{bfd,opcodes}.la
-- 
2.26.2