# HG changeset patch # User "Yann E. MORIN" # Date 1270143928 -7200 # Node ID b579a5cb53d1f35e2c47ab23accd02dcaedba9ac # Parent a6a4beab3125192428ec7e3b0a2eadf3bbb9df3e config: do not force setting kernel and arch In backend mode, only enforce the arch and/or kernel selection if the upper-layer build system effectively forces the selection. diff -r a6a4beab3125 -r b579a5cb53d1 config/backend.in --- a/config/backend.in Fri Apr 02 00:18:26 2010 +0200 +++ b/config/backend.in Thu Apr 01 19:45:28 2010 +0200 @@ -9,25 +9,10 @@ default y if IS_A_BACKEND = "y" || IS_A_BACKEND = "Y" default n if IS_A_BACKEND != "y" && IS_A_BACKEND != "Y" -config BACKEND_ERROR - bool - config BACKEND_ARCH string option env="CT_BACKEND_ARCH" -if BACKEND && BACKEND_ARCH = "" -comment "ERROR !!! Backend architecture is NOT set !" -config BACKEND_ERROR - default y -endif - config BACKEND_KERNEL string option env="CT_BACKEND_KERNEL" - -if BACKEND && BACKEND_KERNEL = "" -comment "ERROR !!! Backend kernel is NOT set !" -config BACKEND_ERROR - default y -endif diff -r a6a4beab3125 -r b579a5cb53d1 config/config.in --- a/config/config.in Fri Apr 02 00:18:26 2010 +0200 +++ b/config/config.in Thu Apr 01 19:45:28 2010 +0200 @@ -1,5 +1,4 @@ source "config/backend.in" -if ! BACKEND_ERROR source "config/global.in" source "config/target.in" source "config/toolchain.in" @@ -10,4 +9,3 @@ source "config/debug.in" source "config/companion_libs.in" source "config/companion_tools.in" -endif # ! BACKEND_ERROR diff -r a6a4beab3125 -r b579a5cb53d1 config/config.mk --- a/config/config.mk Fri Apr 02 00:18:26 2010 +0200 +++ b/config/config.mk Thu Apr 01 19:45:28 2010 +0200 @@ -91,7 +91,7 @@ echo " $${dep_val#\# }"; \ fi; \ if [ "$(5)" = "Y" ]; then \ - echo " depends on BACKEND_$(3) = \"$${_entry}\" || ! BACKEND"; \ + echo " depends on $(3)_$${_entry}_AVAILABLE"; \ fi; \ echo ""; \ done; \ @@ -100,6 +100,12 @@ file="$(4)/$${entry}.in"; \ _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ echo ""; \ + if [ "$(5)" = "Y" ]; then \ + echo "config $(3)_$${_entry}_AVAILABLE"; \ + echo " bool"; \ + echo " default n if ! ( BACKEND_$(3) = \"$${entry}\" || BACKEND_$(3) = \"\" || ! BACKEND )"; \ + echo " default y if BACKEND_$(3) = \"$${entry}\" || BACKEND_$(3) = \"\" || ! BACKEND"; \ + fi; \ echo "if $(3)_$${_entry}"; \ echo "config $(3)"; \ echo " default \"$${entry}\" if $(3)_$${_entry}"; \