diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-01-05 23:02:43 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-01-05 23:02:43 (GMT) |
| commit | ebf01acb41f0f6bb0e0d5629aac9f98733730329 (patch) | |
| tree | 31636a16f970ae3eb86b0c098224ac92b49bf647 /scripts/build/libc/uClibc.sh | |
| parent | 4bcd72fb1604341116621e7e7655520779592103 (diff) | |
Split CT_ExtractAndPatch in two: CT_Extract and CT_Patch:
- it is unworkable to have CT_ExtactAndPAtch cope with all those silly glibc addons:
- they can have 'short' (as 'ports') or 'long' (as glibc-ports-2.7) names
- patches are against eithe the short or long name, but non-uniformly use one or the other
- it is the reposibility of the component (glibc in this case) to handle corner cases such as those
- update all components to use the new functions
/trunk/scripts/build/tools/000-template.sh | 3 2 1 0 +-
/trunk/scripts/build/tools/100-libelf.sh | 3 2 1 0 +-
/trunk/scripts/build/tools/200-sstrip.sh | 3 2 1 0 +-
/trunk/scripts/build/kernel/linux.sh | 3 2 1 0 +-
/trunk/scripts/build/binutils.sh | 3 2 1 0 +-
/trunk/scripts/build/cc/gcc.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/000-template.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/100-dmalloc.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/400-ltrace.sh | 3 2 1 0 +-
/trunk/scripts/build/debug/300-gdb.sh | 9 6 3 0 +++--
/trunk/scripts/build/debug/500-strace.sh | 7 3 4 0 ++--
/trunk/scripts/build/debug/200-duma.sh | 19 8 11 0 ++++------
/trunk/scripts/build/libc/glibc.sh | 14 12 2 0 ++++++-
/trunk/scripts/build/libc/uClibc.sh | 13 9 4 0 +++++--
/trunk/scripts/build/libc/eglibc.sh | 14 12 2 0 ++++++-
/trunk/scripts/build/gmp.sh | 3 2 1 0 +-
/trunk/scripts/build/mpfr.sh | 3 2 1 0 +-
/trunk/scripts/functions | 68 36 32 0 +++++++++++++++++++-----------------
18 files changed, 108 insertions(+), 69 deletions(-)
Diffstat (limited to 'scripts/build/libc/uClibc.sh')
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index cf1623e..e2345ed 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -12,18 +12,23 @@ do_libc_get() { # later... CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src} # uClibc locales - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true + if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then + CT_GetFile "uClibc-locale-030818" ${libc_src} + fi return 0 } # Extract uClibc do_libc_extract() { - CT_ExtractAndPatch "uClibc-${CT_LIBC_VERSION}" + CT_Extract "uClibc-${CT_LIBC_VERSION}" + CT_Patch "uClibc-${CT_LIBC_VERSION}" + # uClibc locales if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then - CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" - CT_ExtractAndPatch "uClibc-locale-030818" nochdir || true + CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale" + CT_Extract "uClibc-locale-030818" nochdir + CT_Patch "uClibc-locale-030818" nochdir CT_Popd fi |