ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-04-15 23:16:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/uClibc: normalize uclibc hidden version names

Browse Source 
Hidden version names for uClibc conflicted:

LIBC_UCLIBC_V_0_9_30_2
LIBC_V_0_9_30_1

name them constantly as:
LIBC_UCLIBC_V_<version>

Also update the build script where we use snapshots by version or snapshots by date.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
This commit is contained in:
Bryan Hundven 2011-01-03 01:15:30 +01:00
parent 3ee9e2e9a1
commit 6bd24a2c73
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/libc/uClibc.in
View File

@ -31,22 +31,22 @@ config LIBC_UCLIBC_V_0_9_30_2
prompt "0.9.30.2"
select LIBC_UCLIBC_0_9_30_or_later
config LIBC_V_0_9_30_1
config LIBC_UCLIBC_V_0_9_30_1
bool
prompt "0.9.30.1"
select LIBC_UCLIBC_0_9_30_or_later
config LIBC_V_0_9_30
config LIBC_UCLIBC_V_0_9_30
bool
prompt "0.9.30"
select LIBC_UCLIBC_0_9_30_or_later
config LIBC_V_0_9_29
config LIBC_UCLIBC_V_0_9_29
bool
prompt "0.9.29 (OBSOLETE)"
depends on OBSOLETE
config LIBC_V_0_9_28_3
config LIBC_UCLIBC_V_0_9_28_3
bool
prompt "0.9.28.3 (OBSOLETE)"
depends on OBSOLETE
@ -54,14 +54,14 @@ config LIBC_V_0_9_28_3
# As of today (20100702) we can be pretty sure that every
# snapshots made since a month ago are post -0.9.30.
config LIBC_V_snapshot
config LIBC_UCLIBC_V_snapshot
bool
prompt "latest snapshot (EXPERIMENTAL)"
depends on EXPERIMENTAL
select LIBC_SUPPORT_NPTL
select LIBC_UCLIBC_0_9_30_or_later
config LIBC_V_specific_date
config LIBC_UCLIBC_V_specific_date
bool
prompt "<specific date> (EXPERIMENTAL)"
depends on EXPERIMENTAL
@ -72,17 +72,17 @@ endchoice
config LIBC_VERSION
string
prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date
prompt "Enter date (YYYYMMDD)" if LIBC_UCLIBC_V_specific_date
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "0.9.31" if LIBC_UCLIBC_V_0_9_31
default "0.9.30.3" if LIBC_UCLIBC_V_0_9_30_3
default "0.9.30.2" if LIBC_UCLIBC_V_0_9_30_2
default "0.9.30.1" if LIBC_V_0_9_30_1
default "0.9.30" if LIBC_V_0_9_30
default "0.9.29" if LIBC_V_0_9_29
default "0.9.28.3" if LIBC_V_0_9_28_3
default "snapshot" if LIBC_V_snapshot
default "0.9.30.1" if LIBC_UCLIBC_V_0_9_30_1
default "0.9.30" if LIBC_UCLIBC_V_0_9_30
default "0.9.29" if LIBC_UCLIBC_V_0_9_29
default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3
default "snapshot" if LIBC_UCLIBC_V_snapshot
config LIBC_UCLIBC_0_9_30_or_later
bool

8
scripts/build/libc/uClibc.sh
View File

@ -25,8 +25,8 @@ do_libc_get() {
}
libc_uclibc_src_dir() {
if [ -z "${CT_LIBC_V_snapshot}" \
-a -z "${CT_LIBC_V_specific_date}" \
if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
-a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
]; then
echo "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
else
@ -38,8 +38,8 @@ libc_uclibc_src_dir() {
do_libc_extract() {
CT_Extract "uClibc-${CT_LIBC_VERSION}"
# Don't patch snapshots
if [ -z "${CT_LIBC_V_snapshot}" \
-a -z "${CT_LIBC_V_specific_date}" \
if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
-a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
]; then
CT_Patch "uClibc" "${CT_LIBC_VERSION}"
fi