summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-10-06 23:13:06 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2014-10-06 23:13:28 -0500
commitc59a468aae2eb6522e97d877992f3b059b4e6242 (patch)
treee9f7563ce2ea18a29064f6df70d9b5648e8945cf
parent4c469b594cac236767599a778b92c1d16049ef82 (diff)
use binutils 2.22 for m68k to fix a issue with testsuite compile
-rw-r--r--target/config/Config.in.toolchain6
-rw-r--r--toolchain/binutils/Makefile.inc14
-rw-r--r--toolchain/uclibc/Makefile.inc12
3 files changed, 21 insertions, 11 deletions
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 47165b978..8f3b1752f 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -74,7 +74,9 @@ config ADK_TOOLCHAIN_BINUTILS_2_20_1
config ADK_TOOLCHAIN_BINUTILS_2_22
prompt "2.22"
boolean
- depends on ADK_LINUX_BFIN || ADK_LINUX_CRIS
+ depends on ADK_LINUX_BFIN \
+ || ADK_LINUX_CRIS \
+ || ADK_LINUX_M68K
config ADK_TOOLCHAIN_BINUTILS_2_23_ARC
prompt "2.23-arc"
@@ -88,6 +90,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24
depends on !ADK_LINUX_ARC
depends on !ADK_LINUX_AVR32
depends on !ADK_LINUX_CRIS
+ depends on !ADK_LINUX_M68K
config ADK_TOOLCHAIN_BINUTILS_GIT
prompt "git"
@@ -97,6 +100,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT
depends on !ADK_LINUX_ARC
depends on !ADK_LINUX_AVR32
depends on !ADK_LINUX_CRIS
+ depends on !ADK_LINUX_M68K
endchoice
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 464f959cb..8e1392bed 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -4,8 +4,8 @@
PKG_NAME:= binutils
ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y)
PKG_VERSION:= 2.24
-PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_RELEASE:= 1
+PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
@@ -13,22 +13,28 @@ ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_23_ARC),y)
# git commit afcd0783a37c73e09439737a11e0b3183746a652
# https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/tree/arc-2.23-tls
PKG_VERSION:= 2.23
-PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_RELEASE:= 1
+PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_SITES:= http://www.openadk.org/distfiles/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-arc.tar.xz
endif
ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_22),y)
PKG_VERSION:= 2.22
-PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_RELEASE:= 1
+PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_20_1),y)
PKG_VERSION:= 2.20.1
-PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_RELEASE:= 1
+PKG_MD5SUM:= a5dd5dd2d212a282cc1d4a84633e0d88
PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
+PKG_VERSION:= git
+PKG_RELEASE:= 1
+PKG_REPO:= git://sourceware.org/git/binutils-gdb.git
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+endif
diff --git a/toolchain/uclibc/Makefile.inc b/toolchain/uclibc/Makefile.inc
index c58903290..2b043758a 100644
--- a/toolchain/uclibc/Makefile.inc
+++ b/toolchain/uclibc/Makefile.inc
@@ -3,13 +3,13 @@
PKG_NAME:= uClibc
ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:= 0.9.34-git
-PKG_REPO:= git://git.uclibc.org/uClibc.git
+PKG_VERSION:= 0.9.34-git
+PKG_RELEASE:= 1
+PKG_REPO:= git://git.uclibc.org/uClibc.git
else
-PKG_VERSION:= $(ADK_LIBC_VERSION)
-PKG_SITES:= http://downloads.uclibc-ng.org/
-endif
+PKG_VERSION:= $(ADK_LIBC_VERSION)
PKG_RELEASE:= 1
-PKG_MD5SUM:= 73e6fe215648d02246f4d195b25fb17e
PKG_SITES:= http://uclibc.org/downloads/
+endif
+PKG_MD5SUM:= 73e6fe215648d02246f4d195b25fb17e
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz