Add possibility to disable packages for some arches.

[people/trikolon/ipfire-2.x.git] / tools / make-functions

diff --git a/tools/make-functions b/tools/make-functions
index e556994f1bece5f612f5409a842753545d08560a..e6333a3838b3675401b0177f6242b0cbe465aa07 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -185,7 +185,6 @@ beautify()
                                        echo -ne "${SET_RESULT_COL}[${FAIL} FAIL ${NORMAL}]\n"
                                        ;;
                                SKIP)
-                                       echo -ne "${SET_TIME_COL}[ ${BOLD}${SET_TIME_COL_REAL}$PKG_TIME${NORMAL} ]"
                                        echo -ne "${SET_RESULT_COL}[${SKIP} SKIP ${NORMAL}]\n"
                                        ;;
                        esac
@@ -318,6 +317,16 @@ lfsmakecommoncheck()
        local PKG_VER=`get_pkg_ver $BASEDIR/lfs/$1`
        beautify make_pkg "$PKG_VER $*"
 
+       # Check if this package is supported by our architecture.
+       # If no SUP_ARCH is found, we assume the package can be built for all.
+       if grep "^SUP_ARCH" ${BASEDIR}/lfs/${1} >/dev/null; then
+               # Check if package supports ${MACHINE} or all architectures.
+               if ! grep -E "^SUP_ARCH.*${MACHINE}|^SUP_ARCH.*all" ${BASEDIR}/lfs/${1} >/dev/null; then
+                       beautify result SKIP
+                       return 1
+               fi
+       fi
+
        # Script slipped?
        local i
        for i in $SKIP_PACKAGE_LIST