summaryrefslogtreecommitdiff
path: root/config/libc/glibc.in
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-12-18 09:42:09 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-12-18 09:42:09 (GMT)
commit7f949eafaf8167855b7749910e1aa304f5316edb (patch)
tree115b1bca266d57cc7e2c0940fd4f14ca415a888d /config/libc/glibc.in
parent2d3c70dd3ddc5a569c0fa1a833fd5920029b5794 (diff)
parent9f89e082c5bcb3c49013eeeae0a1ccbac1d91ba9 (diff)
Merge pull request #288 from bhundven/custom_locations_rewrite
Custom locations rewrite
Diffstat (limited to 'config/libc/glibc.in')
-rw-r--r--config/libc/glibc.in63
1 files changed, 41 insertions, 22 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index c2ba7b9..97b0107 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