diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/backend.in | 26 | ||||
-rw-r--r-- | config/binutils.in | 4 | ||||
-rw-r--r-- | config/binutils/binutils.in | 1 | ||||
-rw-r--r-- | config/cc.in | 2 | ||||
-rw-r--r-- | config/companion_tools.in | 2 | ||||
-rw-r--r-- | config/config.in | 1 | ||||
-rw-r--r-- | config/config.mk | 114 | ||||
-rw-r--r-- | config/configure.in.in | 46 | ||||
-rw-r--r-- | config/debug.in | 2 | ||||
-rw-r--r-- | config/debug/duma.in | 1 | ||||
-rw-r--r-- | config/debug/gdb.in.native | 1 | ||||
-rw-r--r-- | config/debug/ltrace.in | 2 | ||||
-rw-r--r-- | config/debug/strace.in | 2 | ||||
-rw-r--r-- | config/global/build-behave.in | 19 | ||||
-rw-r--r-- | config/global/ct-behave.in | 1 | ||||
-rw-r--r-- | config/global/paths.in | 14 | ||||
-rw-r--r-- | config/kernel.in | 4 | ||||
-rw-r--r-- | config/libc.in | 4 | ||||
-rw-r--r-- | config/target.in | 4 | ||||
-rw-r--r-- | config/toolchain.in | 4 |
20 files changed, 70 insertions, 184 deletions
diff --git a/config/backend.in b/config/backend.in deleted file mode 100644 index 12d278b..0000000 --- a/config/backend.in +++ /dev/null @@ -1,26 +0,0 @@ -# Options specific to crosstool-NG acting as a backend - -config IS_A_BACKEND - string - option env="CT_IS_A_BACKEND" - -config BACKEND - bool - depends on OBSOLETE - default y if IS_A_BACKEND = "y" || IS_A_BACKEND = "Y" - -if BACKEND - -config BACKEND_ARCH - string - option env="CT_BACKEND_ARCH" - -config BACKEND_KERNEL - string - option env="CT_BACKEND_KERNEL" - -config BACKEND_LIBC - string - option env="CT_BACKEND_LIBC" - -endif #if BACKEND diff --git a/config/binutils.in b/config/binutils.in index 99b8b9f..0c6d5c0 100644 --- a/config/binutils.in +++ b/config/binutils.in @@ -36,7 +36,7 @@ endchoice config BINUTILS string -source "config.gen/binutils.in" -source "config.gen/binutils.in.2" +source "config/gen/binutils.in" +source "config/gen/binutils.in.2" endmenu diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 1bb674e..c83cbb1 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -314,7 +314,6 @@ config BINUTILS_FOR_TARGET bool prompt "binutils libraries for the target" depends on ! BARE_METAL - depends on ! BACKEND help Some utilities may need binutils libraries to be available on the target, eg. oprofile. diff --git a/config/cc.in b/config/cc.in index 5603738..81f168c 100644 --- a/config/cc.in +++ b/config/cc.in @@ -20,7 +20,7 @@ config CC_CORE_PASS_1_NEEDED config CC_CORE_PASS_2_NEEDED bool -source "config.gen/cc.in" +source "config/gen/cc.in" config CC_SUPPORT_CXX bool diff --git a/config/companion_tools.in b/config/companion_tools.in index 5291f46..e5ef3fc 100644 --- a/config/companion_tools.in +++ b/config/companion_tools.in @@ -10,6 +10,6 @@ config COMP_TOOLS_FOR_HOST tools into the final toolchain (rather than just using them to build it). -source "config.gen/companion_tools.in" +source "config/gen/companion_tools.in" endmenu diff --git a/config/config.in b/config/config.in index 885f722..21b0c7e 100644 --- a/config/config.in +++ b/config/config.in @@ -1,5 +1,4 @@ source "config/configure.in" -source "config/backend.in" source "config/global.in" source "config/target.in" source "config/toolchain.in" diff --git a/config/config.mk b/config/config.mk deleted file mode 100644 index 670ecba..0000000 --- a/config/config.mk +++ /dev/null @@ -1,114 +0,0 @@ -# =========================================================================== -# crosstool-NG genererated config files -# These targets are used from top-level makefile - -#----------------------------------------------------------- -# List all config files, wether sourced or generated - -# The top-level config file to be used be configurators -# We need it to savedefconfig in scripts/saveSample.sh -export KCONFIG_TOP = config/config.in - -# Build the list of all source config files -STATIC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(shell find $(CT_LIB_DIR)/config -type f \( -name '*.in' -o -name '*.in.2' \) 2>/dev/null)) -# ... and how to access them: -$(STATIC_CONFIG_FILES): config - -# Build a list of per-component-type source config files -ARCH_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/arch/*.in))) -ARCH_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/arch/*.in.2))) -KERNEL_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/kernel/*.in))) -KERNEL_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/kernel/*.in.2))) -CC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/cc/*.in))) -CC_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/cc/*.in.2))) -BINUTILS_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/binutils/*.in))) -BINUTILS_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/binutils/*.in.2))) -LIBC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/libc/*.in))) -LIBC_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/libc/*.in.2))) -DEBUG_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/debug/*.in))) -COMP_TOOLS_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/companion_tools/*.in))) - -# Build the list of generated config files -GEN_CONFIG_FILES = config.gen/arch.in \ - config.gen/kernel.in \ - config.gen/cc.in \ - config.gen/binutils.in \ - config.gen/libc.in \ - config.gen/debug.in \ - config.gen/companion_tools.in -# ... and how to access them: -# Generated files depends on the gen_in_frags script because it has the -# functions needed to build the genrated files, and thus they might need -# re-generation if it changes. -# They also depends on config.mk (this file) because it has the dependency -# rules, and thus they might need re-generation if the deps change. -$(GEN_CONFIG_FILES): config.gen \ - $(CT_LIB_DIR)/scripts/gen_in_frags.sh \ - $(CT_LIB_DIR)/config/config.mk - -# Helper entry for the configurators -PHONY += config_files -config_files: $(STATIC_CONFIG_FILES) $(GEN_CONFIG_FILES) - -# Where to access to the source config files from -config: - @$(CT_ECHO) " LN config" - $(SILENT)ln -s $(CT_LIB_DIR)/config config - -# Where to store the generated config files into -config.gen: - @$(CT_ECHO) " MKDIR config.gen" - $(SILENT)mkdir -p config.gen - -#----------------------------------------------------------- -# Build list of per-component-type items to easily build generated files - -ARCHS = $(patsubst config/arch/%.in,%,$(ARCH_CONFIG_FILES)) -KERNELS = $(patsubst config/kernel/%.in,%,$(KERNEL_CONFIG_FILES)) -CCS = $(patsubst config/cc/%.in,%,$(CC_CONFIG_FILES)) -BINUTILSS = $(patsubst config/binutils/%.in,%,$(BINUTILS_CONFIG_FILES)) -LIBCS = $(patsubst config/libc/%.in,%,$(LIBC_CONFIG_FILES)) -DEBUGS = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES)) -COMP_TOOLS= $(patsubst config/companion_tools/%.in,%,$(COMP_TOOLS_CONFIG_FILES)) - -#----------------------------------------------------------- -# The rules for the generated config files - -# WARNING! If a .in file disapears between two runs, that will NOT be detected! - -config.gen/arch.in: $(ARCH_CONFIG_FILES) $(ARCH_CONFIG_FILES_2) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "Target Architecture" "ARCH" "config/arch" "Y" $(ARCHS) - -config.gen/kernel.in: $(KERNEL_CONFIG_FILES) $(KERNEL_CONFIG_FILES_2) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "Target OS" "KERNEL" "config/kernel" "Y" $(KERNELS) - -config.gen/cc.in: $(CC_CONFIG_FILES) $(CC_CONFIG_FILES_2) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "C compiler" "CC" "config/cc" "N" $(CCS) - -config.gen/binutils.in: $(CC_BINUTILS_FILES) $(CC_BINUTILS_FILES_2) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "Binutils" "BINUTILS" "config/binutils" "N" $(BINUTILSS) - -config.gen/libc.in: $(LIBC_CONFIG_FILES) $(LIBC_CONFIG_FILES_2) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh choice "$@" "C library" "LIBC" "config/libc" "Y" $(LIBCS) - -config.gen/debug.in: $(DEBUG_CONFIG_FILES) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh menu "$@" "Debug facilities" "DEBUG" "config/debug" $(DEBUGS) - -config.gen/companion_tools.in: $(COMP_TOOLS_CONFIG_FILES) - @$(CT_ECHO) ' IN $(@)' - $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh menu "$@" "Companion tools" "COMP_TOOLS" "config/companion_tools" $(COMP_TOOLS) - -#----------------------------------------------------------- -# Cleaning up the mess... - -clean:: - @$(CT_ECHO) " CLEAN config" - $(SILENT)rm -f config 2>/dev/null || true - @$(CT_ECHO) " CLEAN config.gen" - $(SILENT)rm -rf config.gen diff --git a/config/configure.in.in b/config/configure.in.in new file mode 100644 index 0000000..aaebbde --- /dev/null +++ b/config/configure.in.in @@ -0,0 +1,46 @@ +# Default values as found by ./configure + +config CONFIGURE_has_static_link + @KCONFIG_static_link@ + +config CONFIGURE_has_wget + @KCONFIG_wget@ + +config CONFIGURE_has_curl + @KCONFIG_curl@ + +config CONFIGURE_has_stat_flavor_BSD + @KCONFIG_stat_flavor_BSD@ + +config CONFIGURE_has_stat_flavor_GNU + @KCONFIG_stat_flavor_GNU@ + +config CONFIGURE_has_make_3_81_or_newer + @KCONFIG_make_3_81_or_newer@ + +config CONFIGURE_has_libtool_2_4_or_newer + @KCONFIG_libtool_2_4_or_newer@ + +config CONFIGURE_has_libtoolize_2_4_or_newer + @KCONFIG_libtoolize_2_4_or_newer@ + +config CONFIGURE_has_autoconf_2_63_or_newer + @KCONFIG_autoconf_2_63_or_newer@ + +config CONFIGURE_has_autoreconf_2_63_or_newer + @KCONFIG_autoreconf_2_63_or_newer@ + +config CONFIGURE_has_automake_1_15_or_newer + @KCONFIG_automake_1_15_or_newer@ + +config CONFIGURE_has_gnu_m4_1_4_12_or_newer + @KCONFIG_gnu_m4_1_4_12_or_newer@ + +config CONFIGURE_has_cvs + @KCONFIG_cvs@ + +config CONFIGURE_has_svn + @KCONFIG_svn@ + +config CONFIGURE_has_git + @KCONFIG_git@ diff --git a/config/debug.in b/config/debug.in index 9fd99ef..8fc549b 100644 --- a/config/debug.in +++ b/config/debug.in @@ -1,3 +1,3 @@ menu "Debug facilities" -source "config.gen/debug.in" +source "config/gen/debug.in" endmenu diff --git a/config/debug/duma.in b/config/debug/duma.in index 9947ca2..170a694 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -1,6 +1,5 @@ # D.U.M.A. - Detect Unintended Memory Access - Memory checker -## depends on ! BACKEND ## depends on ! BARE_METAL ## help D.U.M.A. - Detect Unintended Memory Access diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index 8684c05..e856b5d 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -4,7 +4,6 @@ config GDB_NATIVE bool prompt "Native gdb" depends on ! BARE_METAL - depends on ! BACKEND select EXPAT_TARGET select NCURSES_TARGET help diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index fc5822d..4c62676 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -1,7 +1,5 @@ # ltrace -## depends on ! BACKEND -## ## select LIBELF_TARGET ## ## help ltrace is a program that simply runs the specified command until it exits. diff --git a/config/debug/strace.in b/config/debug/strace.in index 4cf6980..38dd96f 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -1,7 +1,5 @@ # strace -## depends on ! BACKEND - choice bool prompt "strace version" diff --git a/config/global/build-behave.in b/config/global/build-behave.in index 9ad5438..d3298ea 100644 --- a/config/global/build-behave.in +++ b/config/global/build-behave.in @@ -2,12 +2,9 @@ comment "Build behavior" -comment "Build options hiden" - depends on BACKEND - config PARALLEL_JOBS int - prompt "Number of parallel jobs" if ! BACKEND + prompt "Number of parallel jobs" default 0 help Number of jobs make will be allowed to run concurently. @@ -20,7 +17,7 @@ config PARALLEL_JOBS config LOAD string - prompt "Maximum allowed load" if ! BACKEND + prompt "Maximum allowed load" default "" help Specifies that no new jobs should be started if there are others jobs @@ -33,7 +30,7 @@ config LOAD config USE_PIPES bool - prompt "Use -pipe" if ! BACKEND + prompt "Use -pipe" default y help Use gcc's option -pipe to use pipes rather than temp files when building @@ -83,7 +80,6 @@ choice bool prompt "Shell to use as CONFIG_SHELL" default CONFIG_SHELL_BASH - depends on ! BACKEND config CONFIG_SHELL_SH bool @@ -141,13 +137,10 @@ config CONFIG_SHELL_CUSTOM endchoice -# Do not put this into the choice above, because the choice -# is not available in BACKEND-mode, while we do want this to -# be set even in BACKEND-mode. config CONFIG_SHELL_CUSTOM_PATH string - prompt "Path to custom shell" if ! BACKEND - depends on CONFIG_SHELL_CUSTOM || BACKEND + prompt "Path to custom shell" + depends on CONFIG_SHELL_CUSTOM default "/bin/sh" # Ditto. @@ -157,4 +150,4 @@ config CONFIG_SHELL default "/bin/sh" if CONFIG_SHELL_SH default "/bin/ash" if CONFIG_SHELL_ASH default "${bash}" if CONFIG_SHELL_BASH - default CONFIG_SHELL_CUSTOM_PATH if CONFIG_SHELL_CUSTOM || BACKEND + default CONFIG_SHELL_CUSTOM_PATH if CONFIG_SHELL_CUSTOM diff --git a/config/global/ct-behave.in b/config/global/ct-behave.in index a57c798..42171e4 100644 --- a/config/global/ct-behave.in +++ b/config/global/ct-behave.in @@ -63,7 +63,6 @@ config ALLOW_BUILD_AS_ROOT_SURE config DEBUG_CT bool prompt "Debug crosstool-NG" - depends on ! BACKEND help Say 'y' here to get some options regarding debugging crosstool-NG. diff --git a/config/global/paths.in b/config/global/paths.in index 5313d0d..39e15f3 100644 --- a/config/global/paths.in +++ b/config/global/paths.in @@ -4,7 +4,7 @@ comment "Paths" config LOCAL_TARBALLS_DIR string - prompt "Local tarballs directory" if ! BACKEND + prompt "Local tarballs directory" default "${HOME}/src" help If you have previously downloaded the tarballs, enter the PATH where @@ -12,8 +12,8 @@ config LOCAL_TARBALLS_DIR config SAVE_TARBALLS bool - prompt "Save new tarballs" if ! BACKEND - depends on LOCAL_TARBALLS_DIR != "" || BACKEND + prompt "Save new tarballs" + depends on LOCAL_TARBALLS_DIR != "" default y help If you say 'y' here, new downloaded tarballs will be saved in the @@ -21,7 +21,7 @@ config SAVE_TARBALLS config WORK_DIR string - prompt "Working directory" if ! BACKEND + prompt "Working directory" default "${CT_TOP_DIR}/.build" help Set this to the directory where all build actions will be done. @@ -46,7 +46,7 @@ config BUILD_TOP_DIR config PREFIX_DIR string - prompt "Prefix directory" if ! BACKEND + prompt "Prefix directory" default "${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}" help This is the path the toolchain will run from. @@ -55,7 +55,6 @@ config RM_RF_PREFIX_DIR bool prompt "| Remove the prefix dir prior to building" default y - depends on !BACKEND help If you say 'y' here, then PREFIX_DIR (above) will be eradicated prior to the toolchain is built. @@ -69,9 +68,6 @@ config RM_RF_PREFIX_DIR it into a directory with pre-install, unrelated programs, it would be damageable to remove that directory. In this case, you may want to say 'n' here. - - Note that when acting as a backend, this option is not available, and - is forced to 'n'. config REMOVE_DOCS bool diff --git a/config/kernel.in b/config/kernel.in index 64b69c6..c04f2cb 100644 --- a/config/kernel.in +++ b/config/kernel.in @@ -22,7 +22,7 @@ config KERNEL config KERNEL_VERSION string -source "config.gen/kernel.in" +source "config/gen/kernel.in" comment "Common kernel options" @@ -37,6 +37,6 @@ config SHARED_LIBS You might not want shared libraries if you're building for a target that don't support it (maybe some nommu targets, for example, or bare metal). -source "config.gen/kernel.in.2" +source "config/gen/kernel.in.2" endmenu diff --git a/config/libc.in b/config/libc.in index 0566212..708c3b6 100644 --- a/config/libc.in +++ b/config/libc.in @@ -19,7 +19,7 @@ config LIBC_VERSION So if you want to be able to re-build your toolchain later, you will have to save your C library tarball by yourself. -source "config.gen/libc.in" +source "config/gen/libc.in" config LIBC_SUPPORT_THREADS_ANY bool @@ -123,7 +123,7 @@ config LIBC_XLDD for the native ldd. Please see the help, by running it with '--help' for more explanations. -source "config.gen/libc.in.2" +source "config/gen/libc.in.2" endif # ! LIBC_none diff --git a/config/target.in b/config/target.in index af010c0..7e4e837 100644 --- a/config/target.in +++ b/config/target.in @@ -5,7 +5,7 @@ menu "Target options" config ARCH string -source "config.gen/arch.in" +source "config/gen/arch.in" config ARCH_SUFFIX string @@ -392,6 +392,6 @@ config ARCH_FLOAT default "soft" if ARCH_FLOAT_SW default "softfp" if ARCH_FLOAT_SOFTFP -source "config.gen/arch.in.2" +source "config/gen/arch.in.2" endmenu diff --git a/config/toolchain.in b/config/toolchain.in index c712f39..1b2a289 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -20,7 +20,7 @@ config USE_SYSROOT config SYSROOT_NAME string - prompt "sysroot directory name" if ! BACKEND + prompt "sysroot directory name" depends on USE_SYSROOT default "sysroot" help @@ -33,7 +33,7 @@ config SYSROOT_NAME config SYSROOT_DIR_PREFIX string - prompt "sysroot prefix dir (READ HELP)" if ! BACKEND + prompt "sysroot prefix dir (READ HELP)" depends on USE_SYSROOT default "" help |