diff options
| author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-26 05:07:37 -0800 |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-12-08 10:55:16 -0800 |
| commit | 514f1546d7fe83853c2c2020514e61a90cc26f95 (patch) | |
| tree | 8d4392866f5c3571df307aaf907dd9da92b5ad07 /config/libc/glibc.in | |
| parent | 4e2227e8a5537a8553c503e55d2cb2190f2a0d2f (diff) | |
| download | crosstool-ng-514f1546d7fe83853c2c2020514e61a90cc26f95.tar.gz crosstool-ng-514f1546d7fe83853c2c2020514e61a90cc26f95.tar.bz2 crosstool-ng-514f1546d7fe83853c2c2020514e61a90cc26f95.zip | |
config: Update kconfig for new CT_GetCustom
This commit sort of unifies the kconfigs to handle custom files and
directories.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'config/libc/glibc.in')
| -rw-r--r-- | config/libc/glibc.in | 63 |
1 files changed, 41 insertions, 22 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in index c2ba7b91..97b0107f 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -12,6 +12,42 @@ config THREADS default "nptl" +config LIBC_GLIBC_CUSTOM + bool + prompt "Custom glibc" + depends on EXPERIMENTAL + select LIBC_CUSTOM + select LIBC_GLIBC_2_20_or_later + help + The choosen glibc version shall be not downloaded. Instead use + a custom location to get the source. + +if LIBC_GLIBC_CUSTOM + +config LIBC_GLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom glibc source" + help + Enter the path to the directory or tarball of your source for glibc. + + If the path is a tarball, it should extract to: <name>-<version>/ + where the name is this component, glibc, and the version is set + below in the custom version string. + +config LIBC_GLIBC_CUSTOM_VERSION + string + prompt "Custom GLIBC version" + help + Enter the version number for your custom glibc. + +config LIBC_VERSION + string + default LIBC_GLIBC_CUSTOM_VERSION + +endif # LIBC_GLIBC_CUSTOM + +if ! LIBC_GLIBC_CUSTOM + config CC_GLIBC_SHOW_LINARO bool prompt "Show Linaro versions" @@ -132,15 +168,10 @@ config LIBC_GLIBC_V_2_8 prompt "2.8" select LIBC_GLIBC_PORTS_EXTERNAL -config LIBC_GLIBC_CUSTOM - bool - prompt "Custom glibc" - depends on EXPERIMENTAL - select LIBC_CUSTOM - select LIBC_GLIBC_2_20_or_later - endchoice +endif # ! LIBC_GLIBC_CUSTOM + config LIBC_GLIBC_2_20_or_later bool select LIBC_GLIBC_2_17_or_later @@ -149,20 +180,7 @@ config LIBC_GLIBC_2_20_or_later config LIBC_GLIBC_2_17_or_later bool -config LIBC_CUSTOM - bool - -if LIBC_GLIBC_CUSTOM - -config LIBC_GLIBC_CUSTOM_LOCATION - string - prompt "Full path to custom glibc source" - default "" - help - Enter the path to the directory (or tarball) of your source for glibc, - or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/glibc - -endif # LIBC_GLIBC_CUSTOM +if ! LIBC_GLIBC_CUSTOM config LIBC_VERSION string @@ -187,4 +205,5 @@ config LIBC_VERSION default "2.10.1" if LIBC_GLIBC_V_2_10_1 default "2.9" if LIBC_GLIBC_V_2_9 default "2.8" if LIBC_GLIBC_V_2_8 - default "custom" if LIBC_GLIBC_CUSTOM + +endif # ! LIBC_GLIBC_CUSTOM |