summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/companion_tools.in36
-rw-r--r--config/companion_tools/autoconf.in26
-rw-r--r--config/companion_tools/automake.in36
-rw-r--r--config/companion_tools/libtool.in21
-rw-r--r--config/companion_tools/m4.in26
-rw-r--r--config/companion_tools/make.in41
-rw-r--r--config/config.mk19
7 files changed, 166 insertions, 39 deletions
diff --git a/config/companion_tools.in b/config/companion_tools.in
index f922388..ece3552 100644
--- a/config/companion_tools.in
+++ b/config/companion_tools.in
@@ -2,14 +2,9 @@
menu "Companion tools"
-# Tools that require make-3.81 to build should select this:
-config COMP_TOOLS_make_3_81_NEEDED
- bool
-
config COMP_TOOLS_FORCE_make_3_81
def_bool y
- depends on COMP_TOOLS_make_3_81_NEEDED
- depends on ! CONFIGURE_has_make381
+ depends on ! CONFIGURE_has_make_3_81_or_newer
select COMP_TOOLS
select COMP_TOOLS_make
@@ -20,7 +15,7 @@ config COMP_TOOLS
prompt "Build some companion tools"
help
Crosstool-NG relies on some external tools to be recent enough, namely:
- make = 3.81 (in some cases)
+ make >= 3.81
m4 >= 1.4.12
autoconf >= 2.63
automake >= 1.10.2
@@ -30,32 +25,7 @@ config COMP_TOOLS
but you are strongly encouraged to update your system instead!
if COMP_TOOLS
-
-config COMP_TOOLS_make
- bool
- prompt "make"
-
-config COMP_TOOLS_make_gmake
- bool
- prompt "Add gmake symlink to companion gnu/make"
- depends on COMP_TOOLS_make
-
-config COMP_TOOLS_m4
- bool
- prompt "m4"
-
-config COMP_TOOLS_autoconf
- bool
- prompt "autoconf"
-
-config COMP_TOOLS_automake
- bool
- prompt "automake"
-
-config COMP_TOOLS_libtool
- bool
- prompt "libtool"
-
+source "config.gen/companion_tools.in"
endif
endmenu
diff --git a/config/companion_tools/autoconf.in b/config/companion_tools/autoconf.in
new file mode 100644
index 0000000..3b33df6
--- /dev/null
+++ b/config/companion_tools/autoconf.in
@@ -0,0 +1,26 @@
+# Autoconf
+
+## help Autoconf
+
+choice
+ bool
+ prompt "Autoconf version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config AUTOCONF_V_2_69
+ bool
+ prompt "2.69"
+
+config AUTOCONF_V_2_65
+ bool
+ prompt "2.65"
+
+endchoice
+
+config AUTOCONF_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "2.69" if AUTOCONF_V_2_69
+ default "2.65" if AUTOCONF_V_2_65
diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in
new file mode 100644
index 0000000..500ae14
--- /dev/null
+++ b/config/companion_tools/automake.in
@@ -0,0 +1,36 @@
+# Automake
+
+## help Automake
+
+choice
+ bool
+ prompt "Automake version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config AUTOMAKE_V_1_15
+ bool
+ prompt "1.15"
+
+config AUTOMAKE_V_1_14
+ bool
+ prompt "1.14"
+
+config AUTOMAKE_V_1_11_6
+ bool
+ prompt "1.11.6"
+
+config AUTOMAKE_V_1_11_1
+ bool
+ prompt "1.11.1"
+
+endchoice
+
+config AUTOMAKE_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "1.15" if AUTOMAKE_V_1_15
+ default "1.14" if AUTOMAKE_V_1_14
+ default "1.11.6" if AUTOMAKE_V_1_11_6
+ default "1.11.1" if AUTOMAKE_V_1_11_1
diff --git a/config/companion_tools/libtool.in b/config/companion_tools/libtool.in
new file mode 100644
index 0000000..62e6ee1
--- /dev/null
+++ b/config/companion_tools/libtool.in
@@ -0,0 +1,21 @@
+# Libtool
+
+## help Libtool
+
+choice
+ bool
+ prompt "Libtool version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config LIBTOOL_V_2_4_6
+ bool
+ prompt "2.4.6"
+
+endchoice
+
+config LIBTOOL_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "2.4.6" if LIBTOOL_V_2_4_6
diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in
new file mode 100644
index 0000000..b99a466
--- /dev/null
+++ b/config/companion_tools/m4.in
@@ -0,0 +1,26 @@
+# GNU m4
+
+## help GNU m4
+
+choice
+ bool
+ prompt "m4 version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config M4_V_1_4_17
+ bool
+ prompt "1.4.17"
+
+config M4_V_1_4_13
+ bool
+ prompt "1.4.13"
+
+endchoice
+
+config M4_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "1.4.17" if M4_V_1_4_17
+ default "1.4.13" if M4_V_1_4_13
diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in
new file mode 100644
index 0000000..0935cd8
--- /dev/null
+++ b/config/companion_tools/make.in
@@ -0,0 +1,41 @@
+# GNU make
+
+## help GNU make
+
+choice
+ bool
+ prompt "make version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config MAKE_V_4_2_1
+ bool
+ prompt "4.2.1"
+
+config MAKE_V_4_1
+ bool
+ prompt "4.1"
+
+config MAKE_V_4_0
+ bool
+ prompt "4.0"
+
+config MAKE_V_3_81
+ bool
+ prompt "3.81"
+
+endchoice
+
+config MAKE_GMAKE_SYMLINK
+ bool
+ prompt "Add gmake symlink to companion gnu/make"
+ depends on COMP_TOOLS_make
+
+config MAKE_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "4.2.1" if MAKE_V_4_2_1
+ default "4.1" if MAKE_V_4_1
+ default "4.0" if MAKE_V_4_0
+ default "3.81" if MAKE_V_3_81
diff --git a/config/config.mk b/config/config.mk
index 669e157..670ecba 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -26,14 +26,16 @@ BINUTILS_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LI
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
+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
@@ -67,6 +69,7 @@ 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
@@ -97,6 +100,10 @@ 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...
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 11:15:53 (GMT)