Merge branch 'master' of git+ssh://openadk.org/git/openadk

8 files changed, 70 insertions, 11 deletions

diff --git a/toolchain/Makefile b/toolchain/Makefile
index d2f59f8ba..2c4b24db2 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -3,7 +3,7 @@
 #
 # Steps to build toolchains
 # 1) build and install binutils
-# 2) build and install mpfr and gmp
+# 2) build and install mpfr, mpc and gmp
 # 3) build and install gcc c compiler
 # 4) install kernel-headers
 # 5) install libc headers
@@ -13,7 +13,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=binutils gmp mpfr gcc
+TARGETS:=binutils gmp mpfr mpc gcc
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 TARGETS+=glibc-ports glibc
 LIBC:=glibc
@@ -37,7 +37,7 @@ install: $(TARGETS_INSTALL)
 clean: $(TARGETS_CLEAN)
 download: $(DOWNLOAD)
 
-gcc-prepare: binutils-install gmp-install mpfr-install
+gcc-prepare: binutils-install gmp-install mpfr-install mpc-install
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare
 else
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index c38f81d7a..5a8886e3d 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -2,8 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		binutils
-PKG_VERSION:=		2.20.1
+PKG_VERSION:=		2.20.51
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9cdfb9d6ec0578c166d3beae5e15c4e5
-PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
+PKG_MD5SUM:=		7a68af4b5240a04f6947ef40defa4708
+PKG_SITES:=		http://openadk.org/distfiles/
+#PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index c74c841fe..eb86166ff 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -22,6 +22,10 @@ GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--disable-sjlj-exceptions \
 			--disable-libssp \
 			--disable-libstdcxx-pch \
+			--disable-ppl-version-check \
+			--disable-cloog-version-check \
+			--without-ppl \
+			--without-cloog \
 			--disable-nls
 
 ifeq ($(ADK_TARGET_NO_FPU),y)
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index 5b359b8cf..18dc3f83a 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -15,11 +15,8 @@ $(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
 		--disable-shared \
 		--enable-static \
-		--disable-nls \
 	);
 	touch $@
 
diff --git a/toolchain/mpc/Makefile b/toolchain/mpc/Makefile
new file mode 100644
index 000000000..d790e0912
--- /dev/null
+++ b/toolchain/mpc/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+include Makefile.inc
+include ../rules.mk
+include ${TOPDIR}/mk/buildhlp.mk
+
+ifeq (${ADK_MAKE_PARALLEL},y)
+MPC_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
+	(cd $(WRKBUILD); \
+		$(WRKBUILD)/configure \
+		--prefix=$(STAGING_TOOLS) \
+		--with-gmp=$(STAGING_TOOLS) \
+		--disable-shared \
+		--enable-static \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
+	$(MAKE) ${MPC_MAKEOPTS} -C $(WRKBUILD) all
+	touch $@
+
+$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
+	$(MAKE) -C $(WRKBUILD) install
+	touch $@
+
+include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/mpc/Makefile.inc b/toolchain/mpc/Makefile.inc
new file mode 100644
index 000000000..970a2c848
--- /dev/null
+++ b/toolchain/mpc/Makefile.inc
@@ -0,0 +1,9 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+PKG_NAME:=		mpc
+PKG_VERSION:=		0.8.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e98267ebd5648a39f881d66797122fb6
+PKG_SITES:=		http://www.multiprecision.org/mpc/download/
+GMP_BUILD_DIR:=		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile
index 67753db9b..9feac6522 100644
--- a/toolchain/mpfr/Makefile
+++ b/toolchain/mpfr/Makefile
@@ -16,8 +16,6 @@ $(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
 		--with-gmp-build=$(GMP_BUILD_DIR) \
 		--disable-shared \
 		--enable-static \
diff --git a/toolchain/uClibc/patches/fix-daemon-pthread.patch b/toolchain/uClibc/patches/fix-daemon-pthread.patch
new file mode 100644
index 000000000..a137320c2
--- /dev/null
+++ b/toolchain/uClibc/patches/fix-daemon-pthread.patch
@@ -0,0 +1,18 @@
+	Taken from OpenWrt, this patch fixes for a broken daemon() function
+	in applications linked against pthread, as the fork() function provided
+	by pthread has to be used then. It is said, that this won't fix for
+	statically compiled binaries.
+
+	See here: https://dev.openwrt.org/attachment/ticket/4809/fix-daemon-pthread.patch
+	and here: https://bugs.busybox.net/show_bug.cgi?id=193
+--- a/libc/unistd/daemon.c	2006-07-05 21:52:39.000000000 +0200
++++ b/libc/unistd/daemon.c	2009-03-21 08:45:25.000000000 +0100
+@@ -54,7 +54,7 @@
+ libc_hidden_proto(dup2)
+ libc_hidden_proto(setsid)
+ libc_hidden_proto(chdir)
+-libc_hidden_proto(fork)
++/* libc_hidden_proto(fork) */
+ 
+ int daemon( int nochdir, int noclose )
+ {