make.sh: Build lcms2 before ghostscript

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index f7ca674b183280504a0c9257d0fe8f71a9df9be7..3ebf0b8d0a6cb28cf36a4389d5d44f8d604e8c3f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -36,7 +36,8 @@ BUILD_IMAGES=1                                                        # Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=12
+
+TOOLCHAINVER=20170518
 
 # New architecture variables
 HOST_ARCH="$(uname -m)"
@@ -651,8 +652,8 @@ buildipfire() {
   lfsmake2 intltool
   lfsmake2 libdaemon
   lfsmake2 cups
-  lfsmake2 ghostscript
   lfsmake2 lcms2
+  lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
   lfsmake2 cups-filters
@@ -991,7 +992,7 @@ ipfirepackages() {
 while [ $# -gt 0 ]; do
        case "${1}" in
                --target=*)
-                       configure_target "${1#--target=}"
+                       configure_build "${1#--target=}"
                        ;;
                -*)
                        exiterror "Unknown configuration option: ${1}"