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/debug | |
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/debug')
-rw-r--r-- | scripts/build/debug/000-template.sh | 3 | ||||
-rw-r--r-- | scripts/build/debug/100-dmalloc.sh | 3 | ||||
-rw-r--r-- | scripts/build/debug/200-duma.sh | 19 | ||||
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 9 | ||||
-rw-r--r-- | scripts/build/debug/400-ltrace.sh | 3 | ||||
-rw-r--r-- | scripts/build/debug/500-strace.sh | 7 |
6 files changed, 23 insertions, 21 deletions
diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh index c5fba91..793d786 100644 --- a/scripts/build/debug/000-template.sh +++ b/scripts/build/debug/000-template.sh @@ -10,7 +10,8 @@ do_debug_foobar_get() { # Put your extract code here do_debug_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/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh index 27a70a8..2766ff8 100644 --- a/scripts/build/debug/100-dmalloc.sh +++ b/scripts/build/debug/100-dmalloc.sh @@ -5,7 +5,8 @@ do_debug_dmalloc_get() { } do_debug_dmalloc_extract() { - CT_ExtractAndPatch "dmalloc-${CT_DMALLOC_VERSION}" + CT_Extract "dmalloc-${CT_DMALLOC_VERSION}" + CT_Patch "dmalloc-${CT_DMALLOC_VERSION}" } do_debug_dmalloc_build() { diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index cf52234..b8ef5a6 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -2,26 +2,23 @@ do_debug_duma_get() { CT_GetFile "duma_${CT_DUMA_VERSION}" http://mesh.dl.sourceforge.net/sourceforge/duma/ - # D.U.M.A. doesn't separate its name from its version with a dash, - # but with an underscore. Create a link so that crosstool-NG can - # work correctly: - CT_Pushd "${CT_TARBALLS_DIR}" - duma_ext=$(CT_GetFileExtension "duma_${CT_DUMA_VERSION}") - rm -f "duma-${CT_DUMA_VERSION}${duma_ext}" - ln -sf "duma_${CT_DUMA_VERSION}${duma_ext}" "duma-${CT_DUMA_VERSION}${duma_ext}" # Downloading from sourceforge leaves garbage, cleanup - rm -f showfiles.php\?group_id\=* - CT_Popd + CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"* } do_debug_duma_extract() { - CT_ExtractAndPatch "duma-${CT_DUMA_VERSION}" + CT_Extract "duma_${CT_DUMA_VERSION}" + CT_Pushd "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" + # Even if DUMA uses _ and not -, crosstool-NG uses the dash to split the + # name from the version in order to find the appropriate patches + # YEM: FIXME: make CT_Patch more intelligent, Eg.: CT_Patch duma _ "${CT_DUMA_VERSION}" + CT_Patch "duma-${CT_DUMA_VERSION}" nochdir + CT_Popd } do_debug_duma_build() { CT_DoStep INFO "Installing D.U.M.A." CT_DoLog EXTRA "Copying sources" - # DUMA separates its name from the version with an underscore, not a dash cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma" CT_Pushd "${CT_BUILD_DIR}/build-duma" diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index c2a964e..24d87dd 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -57,15 +57,18 @@ do_debug_gdb_extract() { do_debug_gdb_parts if [ "${do_gdb}" = "y" ]; then - CT_ExtractAndPatch "gdb$(do_debug_gdb_suffix)" + CT_Extract "gdb$(do_debug_gdb_suffix)" + CT_Patch "gdb$(do_debug_gdb_suffix)" fi if [ "${do_insight}" = "y" ]; then - CT_ExtractAndPatch "insight-${CT_GDB_VERSION}" + CT_Extract "insight-${CT_GDB_VERSION}" + CT_Patch "insight-${CT_GDB_VERSION}" fi if [ "${do_ncurses}" = "y" ]; then - CT_ExtractAndPatch "ncurses-${CT_NCURSES_VERSION}" + CT_Extract "ncurses-${CT_NCURSES_VERSION}" + CT_Patch "ncurses-${CT_NCURSES_VERSION}" fi } diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 231a61f..8654e20 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -9,7 +9,8 @@ do_debug_ltrace_get() { } do_debug_ltrace_extract() { - CT_ExtractAndPatch "ltrace-${CT_LTRACE_VERSION}" + CT_Extract "ltrace-${CT_LTRACE_VERSION}" + CT_Patch "ltrace-${CT_LTRACE_VERSION}" } do_debug_ltrace_build() { diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index 8e3c682..6b1ff4d 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -3,13 +3,12 @@ do_debug_strace_get() { CT_GetFile "strace-${CT_STRACE_VERSION}" http://mesh.dl.sourceforge.net/sourceforge/strace/ # Downloading from sourceforge leaves garbage, cleanup - CT_Pushd "${CT_TARBALLS_DIR}" - rm -f showfiles.php\?group_id\=* - CT_Popd + CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"* } do_debug_strace_extract() { - CT_ExtractAndPatch "strace-${CT_STRACE_VERSION}" + CT_Extract "strace-${CT_STRACE_VERSION}" + CT_Patch "strace-${CT_STRACE_VERSION}" } do_debug_strace_build() { |