diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2015-11-10 06:47:17 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-11 16:27:33 (GMT) |
| commit | 930fa77076874655179341433b4f8066deefb0b8 (patch) | |
| tree | a4f0045b6706d203eb89ee22654b56d0f7448565 /scripts | |
| parent | 83403825ee654bcf214a9329d429bcf9603acad5 (diff) | |
uClibc: Reduce supported versions
This commit reduces the number of supported versions to:
* 0.9.33.2
* custom location
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 9 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 37c3ae1..9c6c4c6 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -133,15 +133,12 @@ addToolVersion() { fi ;; uClibc) - # uClibc-0.9.30 and above need some love + # uClibc-0.9.33.2 needs some love ver_M=$(getVersionField "${version}" . 1) ver_m=$(getVersionField "${version}" . 2) ver_p=$(getVersionField "${version}" . 3) - if [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 30 \ - -o ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 31 ]; then - SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_30_or_later" - elif [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 32 ]; then - SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_32_or_later" + elif [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 33 ]; then + SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_33_2_or_later" fi ;; gdb) diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index eac32da..914fd5a 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -71,7 +71,6 @@ do_libc_check_config() { # Build and install headers and start files do_libc_start_files() { - local install_rule local cross CT_DoStep INFO "Installing C library headers" @@ -111,19 +110,13 @@ do_libc_start_files() { LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ headers - if [ "${CT_LIBC_UCLIBC_0_9_30_or_later}" = "y" ]; then - install_rule=install_headers - else - install_rule=install_dev - fi - CT_DoLog EXTRA "Installing headers" CT_DoExecLog ALL \ make ${CT_LIBC_UCLIBC_VERBOSITY} \ CROSS_COMPILE="${cross}" \ PREFIX="${CT_SYSROOT_DIR}/" \ LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \ - ${install_rule} + install_headers if [ "${CT_THREADS}" = "nptl" ]; then CT_DoLog EXTRA "Building start files" |