From: Lionel Sambuc <lionel@minix3.org>
Date: Sun, 7 Feb 2016 21:13:15 +0000 (+0100)
Subject: Cross-compilation fixes:
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=5ef5b27fc158620d80785f43f03fc1ff30cbe16f;p=minix.git

Cross-compilation fixes:

 - GCC >4.9:
     Newer toolchains trigger more warnings, which by default are
   treated as errors. Disable this while building the tools as this
   will be a recurring problem in the future.

   close #105

 - FreeBSD: Fix some fetch.sh scripts which fails as FreeBSD's patch
   fails to patch two .info files. We ignore this for the time being.

Change-Id: Ic669281db6c41005119ea8f76f78b5ec60e1b386
---

diff --git a/external/gpl2/gmake/fetch.sh b/external/gpl2/gmake/fetch.sh
index c99c6b919..a89293276 100755
--- a/external/gpl2/gmake/fetch.sh
+++ b/external/gpl2/gmake/fetch.sh
@@ -27,5 +27,5 @@ then
         tar -xjf make-3.81.tar.bz2 && \
         mv make-3.81 dist && \
         cd dist && \
-        cat ../patches/* | patch -p 1
+        cat ../patches/* | patch -p 1 || true
 fi
diff --git a/external/gpl3/binutils/fetch.sh b/external/gpl3/binutils/fetch.sh
index 470e7d35b..89100de5c 100755
--- a/external/gpl3/binutils/fetch.sh
+++ b/external/gpl3/binutils/fetch.sh
@@ -26,7 +26,7 @@ then
 	tar -oxjf binutils-2.23.2.tar.bz2 && \
 	mv binutils-2.23.2 dist && \
 	cd dist && \
-	cat ../patches/* | patch -p1 && \
+	cat ../patches/* | patch -p1
 	cp ../files/yyscript.h gold && \
 	cp ../files/yyscript.c gold && \
 	rm -f ld/configdoc.texi
diff --git a/tools/Makefile b/tools/Makefile
index e122998e5..c5248235f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,6 +3,11 @@
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
 
+.if defined(__MINIX)
+# Some tools do not compile warning free with newer toolchains.
+NOGCCERROR=	yes
+NOCLANGERROR=	yes
+.endif # defined(__MINIX)
 # Make sure that the ordered build/install processing applies when using
 # plain make.
 .MAIN: build_install