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_libs/cloog.in | 11 +++++++++ config/comp_libs/expat.in | 3 +++ config/comp_libs/gettext.in | 3 +++ config/comp_libs/gmp.in | 7 ++++++ config/comp_libs/isl.in | 26 +++++++++++++++++++ config/comp_libs/libelf.in | 3 +++ config/comp_libs/libiconv.in | 3 +++ config/comp_libs/mpc.in | 3 +++ config/comp_libs/mpfr.in | 3 +++ config/comp_libs/ncurses.in | 59 ++++++++++++++++++++++++++++++++++++++++++++ config/comp_libs/zlib.in | 3 +++ 11 files changed, 124 insertions(+) create mode 100644 config/comp_libs/cloog.in create mode 100644 config/comp_libs/expat.in create mode 100644 config/comp_libs/gettext.in create mode 100644 config/comp_libs/gmp.in create mode 100644 config/comp_libs/isl.in create mode 100644 config/comp_libs/libelf.in create mode 100644 config/comp_libs/libiconv.in create mode 100644 config/comp_libs/mpc.in create mode 100644 config/comp_libs/mpfr.in create mode 100644 config/comp_libs/ncurses.in create mode 100644 config/comp_libs/zlib.in (limited to 'config/comp_libs') diff --git a/config/comp_libs/cloog.in b/config/comp_libs/cloog.in new file mode 100644 index 00000000..b894de91 --- /dev/null +++ b/config/comp_libs/cloog.in @@ -0,0 +1,11 @@ +# CLooG options +## depends on OBSOLETE + +# CLooG 0.18.4 requires ISL 0.12 or newer +# CLooG 0.18.1/0.18.0 requires ISL 0.12 or older + +source "config/versions/cloog.in" + +config CLOOG_HAS_WITH_GMP_ISL_OSL + bool + default y if CLOOG_0_18_or_later diff --git a/config/comp_libs/expat.in b/config/comp_libs/expat.in new file mode 100644 index 00000000..a2753a49 --- /dev/null +++ b/config/comp_libs/expat.in @@ -0,0 +1,3 @@ +# expat config file + +source "config/versions/expat.in" diff --git a/config/comp_libs/gettext.in b/config/comp_libs/gettext.in new file mode 100644 index 00000000..4928ede1 --- /dev/null +++ b/config/comp_libs/gettext.in @@ -0,0 +1,3 @@ +# gettext options + +source "config/versions/gettext.in" diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in new file mode 100644 index 00000000..28359cd7 --- /dev/null +++ b/config/comp_libs/gmp.in @@ -0,0 +1,7 @@ +# GMP options + +source "config/versions/gmp.in" + +config GMP_HAS_MPBSD + bool + default y if !GMP_5_1_or_later diff --git a/config/comp_libs/isl.in b/config/comp_libs/isl.in new file mode 100644 index 00000000..9c74078f --- /dev/null +++ b/config/comp_libs/isl.in @@ -0,0 +1,26 @@ +# ISL options +# FIXME these currently have no effect +## select CLOOG_REQUIRE_0_18_1_or_older if !ISL_0_12_or_later +## select CLOOG_REQUIRE_0_18_4_or_later if !ISL_0_14_or_older + +source "config/versions/isl.in" + +# FIXME should be auto-generated once companion libs are using gen-kconfig (and hence, ## syntax) +config ISL_CLOOG_auto_select_1 + def_bool y + depends on CLOOG_NEEDED && !ISL_0_12_or_later + select CLOOG_REQUIRE_0_18_1_or_older + +# FIXME should be auto-generated once companion libs are using gen-kconfig (and hence, ## syntax) +config ISL_CLOOG_auto_select_2 + def_bool y + depends on CLOOG_NEEDED && !ISL_0_13_or_older + select CLOOG_REQUIRE_0_18_4_or_later + +config ISL_NEEDS_WITH_GMP + bool + default y if !ISL_0_12_or_later + +config ISL_HAS_WITH_PIPLIB + bool + default y if !ISL_0_14_or_later diff --git a/config/comp_libs/libelf.in b/config/comp_libs/libelf.in new file mode 100644 index 00000000..5b268c19 --- /dev/null +++ b/config/comp_libs/libelf.in @@ -0,0 +1,3 @@ +# libelf config file + +source "config/versions/libelf.in" diff --git a/config/comp_libs/libiconv.in b/config/comp_libs/libiconv.in new file mode 100644 index 00000000..99d33655 --- /dev/null +++ b/config/comp_libs/libiconv.in @@ -0,0 +1,3 @@ +# libiconv options + +source "config/versions/libiconv.in" diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in new file mode 100644 index 00000000..790e7558 --- /dev/null +++ b/config/comp_libs/mpc.in @@ -0,0 +1,3 @@ +# MPC options + +source "config/versions/mpc.in" diff --git a/config/comp_libs/mpfr.in b/config/comp_libs/mpfr.in new file mode 100644 index 00000000..5ed7ac86 --- /dev/null +++ b/config/comp_libs/mpfr.in @@ -0,0 +1,3 @@ +# GMP options + +source "config/versions/mpfr.in" diff --git a/config/comp_libs/ncurses.in b/config/comp_libs/ncurses.in new file mode 100644 index 00000000..7087fbe8 --- /dev/null +++ b/config/comp_libs/ncurses.in @@ -0,0 +1,59 @@ +# expat config file + +source "config/versions/ncurses.in" + +config NCURSES_NEW_ABI + bool "ncurses 6.0 ABI support" + depends on EXPERIMENTAL + help + This option allows you to use the new ncurses-6 ABI. + It's wise to leave this disabled and stick with the ncurses-5 ABI! + +config NCURSES_HOST_CONFIG_ARGS + string "Extra configure arguments for host ncurses" + help + Extra arguments that are passed verbatim to the configure when + building host ncurses. + +config NCURSES_HOST_DISABLE_DB + bool "Disable terminfo DB on the host" + default y + help + The terminfo database is not currently not installed on the host + as a part of the toolchain built by crosstool-ng. This means the + library will not be able to use the terminals, unless that database + comes preinstalled. + + Selecting this option allows one to embed some popular terminal + definitions into the library itself. + + If not select, the path to the terminfo database on the host will + likely need to be passed as an argument to configure. + +config NCURSES_HOST_FALLBACKS + string "List of fallback terminals for the host" + default "linux,xterm,xterm-color,xterm-256color,vt100" + help + List of terminal descriptions that will be compiled into the curses + library for the host. + +config NCURSES_TARGET_CONFIG_ARGS + string "Extra configure arguments for target ncurses" + help + Extra arguments that are passed verbatim to the configure when + building target ncurses. + +config NCURSES_TARGET_DISABLE_DB + bool "Disable terminfo DB on the target" + default n + help + The terminfo database is installed with the terminfo database for the + target. If you want to configure ncurses with preselected terminals, + select Y here. + +config NCURSES_TARGET_FALLBACKS + string "List of fallback terminals for the target" + help + List of terminal descriptions that will be compiled into the curses + library for the target. + diff --git a/config/comp_libs/zlib.in b/config/comp_libs/zlib.in new file mode 100644 index 00000000..70668e2c --- /dev/null +++ b/config/comp_libs/zlib.in @@ -0,0 +1,3 @@ +# Zlib options + +source "config/versions/zlib.in" -- cgit v1.2.3