Change p8-pore-binutils to a host-* package.
- Also fix compile issues on newer systems with occ / binutils.
diff --git a/openpower/package/occ/occ-0001-Fix-compile-fail-in-tracepp.patch b/openpower/package/occ/occ-0001-Fix-compile-fail-in-tracepp.patch
new file mode 100644
index 0000000..514f972
--- /dev/null
+++ b/openpower/package/occ/occ-0001-Fix-compile-fail-in-tracepp.patch
@@ -0,0 +1,24 @@
+From da9578199b0248e0f0b7b72318dd7275f4044767 Mon Sep 17 00:00:00 2001
+From: Patrick Williams <iawillia@us.ibm.com>
+Date: Thu, 11 Dec 2014 17:36:58 -0600
+Subject: [PATCH] Fix compile fail in tracepp.
+
+---
+ src/tracepp/tracepp.C | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tracepp/tracepp.C b/src/tracepp/tracepp.C
+index 8d5d911..a197dd5 100755
+--- a/src/tracepp/tracepp.C
++++ b/src/tracepp/tracepp.C
+@@ -50,6 +50,7 @@
+ #include <fcntl.h>
+ #include <map>
+ #include <vector>
++#include <unistd.h>
+
+ #include <sys/types.h>
+ typedef u_int32_t u32 ;
+--
+2.1.1
+
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 3d68d4e..ba078e2 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -7,7 +7,7 @@
OCC_VERSION ?= 6d6e33e87de7f4413f8a6c4712059d439159fded
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
OCC_LICENSE = Apache-2.0
-OCC_DEPENDENCIES = host-binutils p8-pore-binutils
+OCC_DEPENDENCIES = host-binutils host-p8-pore-binutils
OCC_INSTALL_IMAGES = YES
OCC_INSTALL_TARGET = NO
diff --git a/openpower/package/p8-pore-binutils/Config.in b/openpower/package/p8-pore-binutils/Config.in
index 7fd414c..6099c31 100644
--- a/openpower/package/p8-pore-binutils/Config.in
+++ b/openpower/package/p8-pore-binutils/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_P8_PORE_BINUTILS
+config BR2_PACKAGE_HOST_P8_PORE_BINUTILS
bool "p8-pore-binutils"
default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
select BR2_CPP
diff --git a/openpower/package/p8-pore-binutils/p8-pore-binutils-0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch b/openpower/package/p8-pore-binutils/p8-pore-binutils-0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch
new file mode 100644
index 0000000..c131ab9
--- /dev/null
+++ b/openpower/package/p8-pore-binutils/p8-pore-binutils-0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch
@@ -0,0 +1,134 @@
+From 7ca01ed925b6be550d5d46bd2f0a68bb3e63ff7b Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Mon, 7 Jan 2013 12:11:13 +0000
+Subject: [PATCH] * ld.texinfo: Replace @ with @@ when it is part of the
+ text. Correct ordering of M68HC11 entry.
+
+ * doc/binutils.texi: Fix ordering of top level nodes.
+ Replace erroneous uses of @itemx with @item.
+
+ * bfd.texinfo: Replace @ with @@ when it is part of the text.
+---
+ bfd/doc/bfd.texinfo | 12 +++++++-----
+ binutils/doc/binutils.texi | 8 ++++----
+ ld/ld.texinfo | 26 ++++++++++++++------------
+ 6 files changed, 39 insertions(+), 21 deletions(-)
+
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
+index 56a0510..fb1802b 100644
+--- a/binutils/doc/binutils.texi
++++ b/binutils/doc/binutils.texi
+@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
+ * objcopy:: Copy and translate object files
+ * objdump:: Display information from object files
+ * ranlib:: Generate index to archive contents
+-* readelf:: Display the contents of ELF format files
+ * size:: List section sizes and total size
+ * strings:: List printable strings from files
+ * strip:: Discard symbols
+-* elfedit:: Update the ELF header of ELF files
+ * c++filt:: Filter to demangle encoded C++ symbols
+ * cxxfilt: c++filt. MS-DOS name for c++filt
+ * addr2line:: Convert addresses to file and line
+ * nlmconv:: Converts object code into an NLM
+-* windres:: Manipulate Windows resources
+ * windmc:: Generator for Windows message resources
++* windres:: Manipulate Windows resources
+ * dlltool:: Create files needed to build and use DLLs
++* readelf:: Display the contents of ELF format files
++* elfedit:: Update the ELF header of ELF files
+ * Common Options:: Command-line options for all utilities
+ * Selecting the Target System:: How these utilities determine the target
+ * Reporting Bugs:: Reporting Bugs
+@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
+ @c man end
+ @end ignore
+
+-@node c++filt, addr2line, elfedit, Top
++@node c++filt, addr2line, strip, Top
+ @chapter c++filt
+
+ @kindex c++filt
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
+ @ifset ARM
+ * ARM:: ld and the ARM family
+ @end ifset
+-@ifset HPPA
+-* HPPA ELF32:: ld and HPPA 32-bit ELF
+-@end ifset
+ @ifset M68HC11
+ * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families
+ @end ifset
++@ifset HPPA
++* HPPA ELF32:: ld and HPPA 32-bit ELF
++@end ifset
+ @ifset M68K
+ * M68K:: ld and Motorola 68K family
+ @end ifset
+@@ -6012,6 +6014,9 @@ functionality are not listed.
+ @ifset I960
+ * i960:: @command{ld} and the Intel 960 family
+ @end ifset
++@ifset M68HC11
++* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
++@end ifset
+ @ifset ARM
+ * ARM:: @command{ld} and the ARM family
+ @end ifset
+@@ -6027,9 +6032,6 @@ functionality are not listed.
+ @ifset MSP430
+ * MSP430:: @command{ld} and MSP430
+ @end ifset
+-@ifset M68HC11
+-* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
+-@end ifset
+ @ifset POWERPC
+ * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support
+ @end ifset
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+--
+2.1.1
+
diff --git a/openpower/package/p8-pore-binutils/p8-pore-binutils-0002-Skip-docs.patch b/openpower/package/p8-pore-binutils/p8-pore-binutils-0002-Skip-docs.patch
new file mode 100644
index 0000000..5ad14f5
--- /dev/null
+++ b/openpower/package/p8-pore-binutils/p8-pore-binutils-0002-Skip-docs.patch
@@ -0,0 +1,67 @@
+From 8056846566045eab511ab134c4a04662ce3e1cea Mon Sep 17 00:00:00 2001
+From: Patrick Williams <iawillia@us.ibm.com>
+Date: Thu, 11 Dec 2014 16:30:42 -0600
+Subject: [PATCH] Skip docs.
+
+---
+ binutils/Makefile.am | 2 +-
+ binutils/Makefile.in | 2 +-
+ gas/Makefile.am | 2 +-
+ gas/Makefile.in | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/binutils/Makefile.am b/binutils/Makefile.am
+index 7f5f0c4..26bf327 100644
+--- a/binutils/Makefile.am
++++ b/binutils/Makefile.am
+@@ -20,7 +20,7 @@
+ AUTOMAKE_OPTIONS = dejagnu no-dist foreign
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+
+-SUBDIRS = doc po
++SUBDIRS = po
+
+ tooldir = $(exec_prefix)/$(target_alias)
+
+diff --git a/binutils/Makefile.in b/binutils/Makefile.in
+index c6e0003..5f34bf9 100644
+--- a/binutils/Makefile.in
++++ b/binutils/Makefile.in
+@@ -434,7 +434,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = dejagnu no-dist foreign
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+-SUBDIRS = doc po
++SUBDIRS = po
+ tooldir = $(exec_prefix)/$(target_alias)
+
+ # Automake 1.10+ disables lex and yacc output file regeneration if
+diff --git a/gas/Makefile.am b/gas/Makefile.am
+index f65225f..3850223 100644
+--- a/gas/Makefile.am
++++ b/gas/Makefile.am
+@@ -20,7 +20,7 @@
+ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+
+-SUBDIRS = doc po
++SUBDIRS = po
+
+ tooldir = $(exec_prefix)/$(target_alias)
+
+diff --git a/gas/Makefile.in b/gas/Makefile.in
+index c7b3597..162d2c1 100644
+--- a/gas/Makefile.in
++++ b/gas/Makefile.in
+@@ -300,7 +300,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+-SUBDIRS = doc po
++SUBDIRS = po
+ tooldir = $(exec_prefix)/$(target_alias)
+
+ # Automake 1.10+ disables lex and yacc output file regeneration if
+--
+2.1.1
+
diff --git a/openpower/package/p8-pore-binutils/p8-pore-binutils.mk b/openpower/package/p8-pore-binutils/p8-pore-binutils.mk
index 3009f7d..3809581 100644
--- a/openpower/package/p8-pore-binutils/p8-pore-binutils.mk
+++ b/openpower/package/p8-pore-binutils/p8-pore-binutils.mk
@@ -5,28 +5,25 @@
################################################################################
P8_PORE_BINUTILS_VERSION ?= 94a1a56cb3ce72a2d6202ab54206912cf9e1feb1
-P8_PORE_BINUTILS_SITE ?= $(call github,open-power,p8-pore-inutils,$(P8_PORE_BINUTILS_VERSION))
-P8_PORE_BINUTILS_LICENSE = Apache-2.0
-P8_PORE_BINUTILS_DEPENDENCIES = host-binutils
+P8_PORE_BINUTILS_SITE ?= $(call github,open-power,p8-pore-binutils,$(P8_PORE_BINUTILS_VERSION))
+P8_PORE_BINUTILS_LICENSE = GPLv3+
-P8_PORE_BINUTILS_INSTALL_IMAGES = YES
-P8_PORE_BINUTILS_INSTALL_TARGET = NO
+HOST_P8_PORE_BINUTILS_DEPENDENCIES = host-binutils
P8_PORE_BINUTILS_DIR = $(STAGING_DIR)/p8-pore-binutils
P8_PORE_BINUTILS_BIN = $(STAGING_DIR)/p8-pore-binutils/linux
-define P8_PORE_BINUTILS_BUILD_CMDS
+define HOST_P8_PORE_BINUTILS_BUILD_CMDS
cd $(@D) && \
./configure --prefix=$(P8_PORE_BINUTILS_DIR) \
--exec-prefix=$(P8_PORE_BINUTILS_BIN) \
- --target=pore-elf64 \
- --build=i386-unknown-linux-gnu && \
+ --target=pore-elf64 && \
make configure-host && \
make LDFLAGS=-all-static
endef
-define P8_PORE_BINUTILS_INSTALL_IMAGES_CMDS
+define HOST_P8_PORE_BINUTILS_INSTALL_CMDS
bash -c 'cd $(@D) && make install'
endef
-$(eval $(generic-package))
+$(eval $(host-generic-package))