From ff0a1a3da605ca157e3f3d0ed2d8b9acb30c2f69 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 4 Jul 2017 19:19:42 -0700 Subject: Switch gen-kconfig to new framework Also: - Move companion_* to comp_* to match the kconfig symbols - Replace bootstrap with former gen-versions.sh - Fold *.in.2 into their respective first parts; this moves common options to the end - if it is undesirable, inclusion of *.in can be moved where *.in.2 used to be (but that will also move version selection after common options). - Retire addToolVersion.sh (may later replace with a more comprehensive script that tries to download the added tarballs, copy the patches and try to apply them, and create a version.desc). Signed-off-by: Alexey Neyman --- config/comp_tools/autoconf.in | 7 +++++++ config/comp_tools/automake.in | 6 ++++++ config/comp_tools/libtool.in | 6 ++++++ config/comp_tools/m4.in | 5 +++++ config/comp_tools/make.in | 10 ++++++++++ 5 files changed, 34 insertions(+) create mode 100644 config/comp_tools/autoconf.in create mode 100644 config/comp_tools/automake.in create mode 100644 config/comp_tools/libtool.in create mode 100644 config/comp_tools/m4.in create mode 100644 config/comp_tools/make.in (limited to 'config/comp_tools') diff --git a/config/comp_tools/autoconf.in b/config/comp_tools/autoconf.in new file mode 100644 index 00000000..b49017de --- /dev/null +++ b/config/comp_tools/autoconf.in @@ -0,0 +1,7 @@ +# Autoconf + +## default y if !CONFIGURE_has_autoconf_2_63_or_newer +## default y if !CONFIGURE_has_autoreconf_2_63_or_newer +## help Autoconf + +source "config/versions/autoconf.in" diff --git a/config/comp_tools/automake.in b/config/comp_tools/automake.in new file mode 100644 index 00000000..455200e5 --- /dev/null +++ b/config/comp_tools/automake.in @@ -0,0 +1,6 @@ +# Automake + +## default y if !CONFIGURE_has_automake_1_15_or_newer +## help Automake + +source "config/versions/automake.in" diff --git a/config/comp_tools/libtool.in b/config/comp_tools/libtool.in new file mode 100644 index 00000000..071b53ee --- /dev/null +++ b/config/comp_tools/libtool.in @@ -0,0 +1,6 @@ +# Libtool + +## default y if !CONFIGURE_has_libtool_2_4_or_newer +## default y if !CONFIGURE_has_libtoolize_2_4_or_newer + +source "config/versions/libtool.in" diff --git a/config/comp_tools/m4.in b/config/comp_tools/m4.in new file mode 100644 index 00000000..1a81a9f1 --- /dev/null +++ b/config/comp_tools/m4.in @@ -0,0 +1,5 @@ +# GNU m4 + +## default y if !CONFIGURE_has_gnu_m4_1_4_12_or_newer + +source "config/versions/m4.in" diff --git a/config/comp_tools/make.in b/config/comp_tools/make.in new file mode 100644 index 00000000..5c9cfb3a --- /dev/null +++ b/config/comp_tools/make.in @@ -0,0 +1,10 @@ +# GNU make + +## default y if !CONFIGURE_has_make_3_81_or_newer + +source "config/versions/make.in" + +config MAKE_GMAKE_SYMLINK + bool + prompt "Add gmake symlink to companion gnu/make" + depends on COMP_TOOLS_make -- cgit v1.2.3