diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /toolchain/binutils | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'toolchain/binutils')
| -rw-r--r-- | toolchain/binutils/Makefile | 19 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile.inc | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index bb7797e92..d76d98125 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -2,22 +2,20 @@ # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk -include ../rules.mk include Makefile.inc +include ../rules.mk include ${TOPDIR}/mk/buildhlp.mk -ifeq ($(ADK_SSP),y) -CONFOPTS+= --enable-libssp -else -CONFOPTS+= --disable-libssp -endif - ifeq ($(ADK_LINUX_64),y) CONFOPTS+= --enable-64-bit-bfd endif -$(WRKBUILD)/.headers: -$(WRKBUILD)/.configured: +ifeq (${ADK_MAKE_PARALLEL},y) +BINUTILS_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ @@ -31,12 +29,13 @@ $(WRKBUILD)/.configured: --disable-dependency-tracking \ --disable-libtool-lock \ --disable-werror \ + --disable-libssp \ ${CONFOPTS} \ ); touch $@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured - $(MAKE) -C $(WRKBUILD) all + $(MAKE) ${BINUTILS_MAKEOPTS} -C $(WRKBUILD) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index b5a9e3542..c38f81d7a 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= binutils -PKG_VERSION:= 2.19.1 +PKG_VERSION:= 2.20.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 09a8c5821a2dfdbb20665bc0bd680791 +PKG_MD5SUM:= 9cdfb9d6ec0578c166d3beae5e15c4e5 PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 |