]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Require libc.a for toolchain build.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 11 May 2009 13:10:38 +0000 (15:10 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 11 May 2009 13:10:38 +0000 (15:10 +0200)
Reordered some requirements.

tools/make-check

index 315caadea303ff4300505165449531fcad645032..556212c0a8d0983d319b8d1195fddf0d685c0ef1 100644 (file)
@@ -61,7 +61,6 @@ check_toolchain() {
        check_common "GNU Bison"        "1.875"         "bison --version | head -n1"
        #check_common "/usr/bin/yacc links bison?"      "if ! which yacc; then echo \"command not found\"; fi"
        check_common "Bzip2"            "1.0.2"         "bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d\" \" -f1,6-"
-       check_common "Coreutils"        "5.0"           "chown --version | head -n1 | cut -d\")\" -f2" "Coreutils:"
        check_common "Diffutils"        "2.8"           "diff --version | head -n1"
        check_common "Findutils"        "4.1.20"        "find --version | head -n1"
        check_common "GNU awk"          "3.0"           "gawk --version | head -n1"
@@ -69,6 +68,7 @@ check_toolchain() {
        check_common "GNU CC"           "3.0.1"         "gcc --version | head -n1"
        check_common "GNU C++"          "3.0.1"         "g++ --version | head -n1"
        check_common "GNU libc"         "2.2.5"         "/lib/libc.so.6 | head -n1 | cut -d\" \" -f1-7"
+       check_common "GNU libc static"  "2.2.5"         "ls /lib/libc.a"
        check_common "GNU Grep"         "2.5"           "grep --version | head -n1"
        check_common "GNU zip"          "1.2.4"         "gzip --version | head -n1"
        check_common "Linux 2.6"        "2.6.x"         "uname -r" "Linux: "
@@ -83,10 +83,11 @@ check_toolchain() {
 }
 
 check_build() {
-       check_common "Python"                           "python -V"
-       check_common "GNU make"         "3.79.1"        "make --version | head -n1"
+       check_common "Coreutils"        "5.0"           "chown --version | head -n1 | cut -d\")\" -f2" "Coreutils:"
        check_common "Git"                              "git --version"
+       check_common "GNU make"         "3.79.1"        "make --version | head -n1"
        check_common "GNU which"                        "which --version | head -n1"
+       check_common "Python"                           "python -V"
 }
 
 check_code() {