merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'

     and 'd4a97f257158aba4fde91347580030110ef215bf'

4 files changed, 42 insertions, 3 deletions

diff --git a/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 b/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2
new file mode 100644
index 0000000000..583ea40a84
--- /dev/null
+++ b/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2
diff --git a/packages/binutils/binutils-avr32.inc b/packages/binutils/binutils-avr32.inc
new file mode 100644
index 0000000000..38c3866f96
--- /dev/null
+++ b/packages/binutils/binutils-avr32.inc
@@ -0,0 +1,28 @@
+# Extra tasks required when using Atmel's patches to binutils
+# See http://avr32linux.org/twiki/bin/view/Main/BinutilsPatches for
+# more information
+
+
+do_avr32_reconf () {
+        if test ${TARGET_ARCH} == avr32; then
+            (cd ${S} && autoconf2.13) || die "Error running autoconf"
+            for dir in bfd opcodes binutils ld; do
+                (cd "${S}/$dir" &&
+                 aclocal &&
+                 autoconf &&
+                 automake &&
+                 autoheader) || die "Error reconfiguring $dir"
+            done
+        fi
+}
+
+do_avr32_configure_bfd () {
+        if test ${TARGET_ARCH} == avr32; then
+            (cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'"
+            (cd ${B}/bfd && make headers) || die "Error running 'make headers'"
+        fi
+}
+
+addtask avr32_reconf after do_patch before do_configure
+addtask avr32_configure_bfd after do_configure before do_compile
+          
diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc
index 684cf54b8e..49d3aeaa3c 100644
--- a/packages/binutils/binutils.inc
+++ b/packages/binutils/binutils.inc
@@ -67,6 +67,11 @@ export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 
 do_configure () {
 	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+
+        # Fix for issues when system's texinfo version >= 4.10
+        # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621)
+        sed -i -e "s@egrep 'texinfo.*'@egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])'@" '${S}/configure'
+
 	oe_runconf
 #
 # must prime config.cache to ensure the build of libiberty
diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb
index 0696a24e72..e721cb41f3 100644
--- a/packages/binutils/binutils_2.17.bb
+++ b/packages/binutils/binutils_2.17.bb
@@ -1,6 +1,7 @@
 require binutils.inc
+require binutils-avr32.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
@@ -18,8 +19,13 @@ SRC_URI += "\
 	file://300-012_check_ldrunpath_length.patch;patch=1 \
 	file://300-001_ld_makefile_patch.patch;patch=1 \
 	file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
-        file://500-avr32-atmel.1.3.0.patch;patch=1 \
-        file://501-avr32-fix-pool-alignment.patch;patch=1 \
+"
+# removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes)
+#        file://500-avr32-atmel.1.3.0.patch;patch=1 \
+#        file://501-avr32-fix-pool-alignment.patch;patch=1 \
+
+SRC_URI_append_avr32 = "\
+        file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \
 "
 
 # Zecke's OSX fixes