]> Zhao Yanbai Git Server - minix.git/commitdiff
Cross-compilation fixes: 96/3296/1
authorLionel Sambuc <lionel@minix3.org>
Sun, 7 Feb 2016 21:13:15 +0000 (22:13 +0100)
committerLionel Sambuc <lionel.sambuc@gmail.com>
Mon, 8 Feb 2016 12:05:55 +0000 (13:05 +0100)
 - 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

external/gpl2/gmake/fetch.sh
external/gpl3/binutils/fetch.sh
tools/Makefile

index c99c6b919d8d4f2e8a96b53fa218abb8e5303b4d..a8929327678fdc1a21669d7b962436df1ec72030 100755 (executable)
@@ -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
index 470e7d35b2cb7c48fd0e45c71449958d4bb6e14d..89100de5cdbf048dd58babee9001276a1e5ddc3f 100755 (executable)
@@ -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
index e122998e5c6145e5a6c7bde05f51353a89235055..c5248235f538943a4869727aa1692d367650bd63 100644 (file)
@@ -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