From ebf01acb41f0f6bb0e0d5629aac9f98733730329 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 5 Jan 2009 23:02:43 +0000 Subject: 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(-) --- scripts/build/tools/000-template.sh | 3 ++- scripts/build/tools/100-libelf.sh | 3 ++- scripts/build/tools/200-sstrip.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts/build/tools') diff --git a/scripts/build/tools/000-template.sh b/scripts/build/tools/000-template.sh index 23c95755..032f289c 100644 --- a/scripts/build/tools/000-template.sh +++ b/scripts/build/tools/000-template.sh @@ -10,7 +10,8 @@ do_tools_foobar_get() { # Put your extract code here do_tools_foobar_extract() { # For example: - # CT_ExtractAndPatch "foobar-${CT_FOOBAR_VERSION}" + # CT_Extract "foobar-${CT_FOOBAR_VERSION}" + # CT_Patch "foobar-${CT_FOOBAR_VERSION}" : } diff --git a/scripts/build/tools/100-libelf.sh b/scripts/build/tools/100-libelf.sh index b82e3cfb..2ee92927 100644 --- a/scripts/build/tools/100-libelf.sh +++ b/scripts/build/tools/100-libelf.sh @@ -8,7 +8,8 @@ do_tools_libelf_get() { } do_tools_libelf_extract() { - CT_ExtractAndPatch "libelf-${CT_LIBELF_VERSION}" + CT_Extract "libelf-${CT_LIBELF_VERSION}" + CT_Patch "libelf-${CT_LIBELF_VERSION}" } do_tools_libelf_build() { diff --git a/scripts/build/tools/200-sstrip.sh b/scripts/build/tools/200-sstrip.sh index 90090751..b29a079f 100644 --- a/scripts/build/tools/200-sstrip.sh +++ b/scripts/build/tools/200-sstrip.sh @@ -7,7 +7,8 @@ case "${CT_SSTRIP_FROM}" in http://www.muppetlabs.com/~breadbox/pub/software } do_tools_sstrip_extract() { - CT_ExtractAndPatch "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}" + CT_Extract "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}" + CT_Patch "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}" } do_tools_sstrip_build() { CT_DoStep INFO "Installing sstrip" -- cgit v1.2.3