diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain/glibc-ports/Makefile.inc | 2 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 2 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain/mpfr/Makefile.inc | 4 | ||||
| -rw-r--r-- | toolchain/rules.mk | 1 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile.inc | 2 |
10 files changed, 13 insertions, 18 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile index fe16fc6af..d2f59f8ba 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -38,15 +38,11 @@ clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) gcc-prepare: binutils-install gmp-install mpfr-install -<<<<<<< HEAD ifeq ($(ADK_TARGET_LIB_GLIBC),y) $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare else $(LIBC)-prepare: gcc-prepare kernel-headers-prepare endif -======= -$(LIBC)-prepare: gcc-prepare kernel-headers-prepare ->>>>>>> 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 gcc-configure: $(LIBC)-prepare $(LIBC)-compile: gcc-configure gcc-compile: $(LIBC)-install diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 53ddb5dde..d76d98125 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -2,8 +2,8 @@ # 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_LINUX_64),y) diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index 0e8b1dc20..0dba0457c 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= eglibc -PKG_VERSION:= 2.11 +PKG_VERSION:= 2.11.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1b5d08c87de09018dcabd9974ba754d4 -PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_MD5SUM:= 393cfbba56898bf7d5d5444fe3313cb4 +PKG_SITES:= http://openadk.org/distfiles/ diff --git a/toolchain/glibc-ports/Makefile.inc b/toolchain/glibc-ports/Makefile.inc index 20e50b577..42e68663f 100644 --- a/toolchain/glibc-ports/Makefile.inc +++ b/toolchain/glibc-ports/Makefile.inc @@ -4,5 +4,5 @@ PKG_NAME:= glibc-ports PKG_VERSION:= 2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 55d50abb2d7c366bde6fb5e35e681f9b +PKG_MD5SUM:= 7100d8ba81c52e90e7fb4795d2f736c9 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 23659af5d..0a7530565 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -4,5 +4,5 @@ PKG_NAME:= glibc PKG_VERSION:= 2.11.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 55d50abb2d7c366bde6fb5e35e681f9b +PKG_MD5SUM:= cf60820c052b14a9c5a7816fc7dc0161 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 1a6a77d26..5b359b8cf 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -2,8 +2,8 @@ # 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_MAKE_PARALLEL},y) diff --git a/toolchain/gmp/Makefile.inc b/toolchain/gmp/Makefile.inc index ea02b2d0e..29d2e2a68 100644 --- a/toolchain/gmp/Makefile.inc +++ b/toolchain/gmp/Makefile.inc @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gmp -PKG_VERSION:= 4.3.1 +PKG_VERSION:= 4.3.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 26cec15a90885042dd4a15c4003b08ae +PKG_MD5SUM:= dd60683d7057917e34630b4a787932e8 PKG_SITES:= ${MASTER_SITE_GNU:=gmp/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -GMP_BUILD_DIR:= $(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +GMP_BUILD_DIR:= $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/toolchain/mpfr/Makefile.inc b/toolchain/mpfr/Makefile.inc index 665796739..6f4ed40ef 100644 --- a/toolchain/mpfr/Makefile.inc +++ b/toolchain/mpfr/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= mpfr -PKG_VERSION:= 2.4.1 +PKG_VERSION:= 2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= c5ee0a8ce82ad55fe29ac57edd35d09e +PKG_MD5SUM:= 89e59fe665e2b3ad44a6789f40b059a0 PKG_SITES:= http://www.mpfr.org/mpfr-current/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/toolchain/rules.mk b/toolchain/rules.mk index fa8be6bd3..d2710d053 100644 --- a/toolchain/rules.mk +++ b/toolchain/rules.mk @@ -2,4 +2,3 @@ # material, please see the LICENCE file in the top-level directory. WRKDIR_BASE= ${TOOLCHAIN_BUILD_DIR} -WRKDIR= ${WRKDIR_BASE} diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc index cc215bd1c..1ffcde868 100644 --- a/toolchain/uClibc/Makefile.inc +++ b/toolchain/uClibc/Makefile.inc @@ -4,6 +4,6 @@ PKG_NAME:= uClibc PKG_VERSION:= 0.9.30.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1a4b84e5536ad8170563ffa88c34679c +PKG_MD5SUM:= e759ec855500082ac3e671dd6cacfdb0 PKG_SITES:= http://uclibc.org/downloads/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 |