summaryrefslogtreecommitdiff
path: root/packages/binutils
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-04-30 11:45:25 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-04-30 11:45:25 +0000
commit2eebccf63414618a6da891784eef7635a885e33e (patch)
tree18f260a22143c4a495ea660bdaa2e34632f96cdf /packages/binutils
parent97a1321ef27cb993f15464c2c43e02f81543a401 (diff)
parent0970057a1b0c654384a46c2361888322eb614d5e (diff)
merge of '26a2db272eb8a8c45759850000cba2e07e5de47e'
and 'c7279b542db917aa1365c575fa3b2d81439abf03'
Diffstat (limited to 'packages/binutils')
-rw-r--r--packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2bin0 -> 184944 bytes
-rw-r--r--packages/binutils/binutils.inc5
-rw-r--r--packages/binutils/binutils_2.17.bb12
3 files changed, 14 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
Binary files differ
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