Add uClibc-0.9.29:

  - associated patch set
  - update the munging function to accomodate the new config variables
libfloat version was missing from the previous commit... :-(
Better handle the case where the sample directory already exist but isn't under revision control, and in case the destination file doesn't exist in the sample directory.

3 files changed, 38 insertions, 8 deletions

diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh
index 1b8f99e..aaeb46c 100644
--- a/scripts/build/libc_uClibc.sh
+++ b/scripts/build/libc_uClibc.sh
@@ -142,32 +142,46 @@ mungeuClibcConfig() {
     config_file="$1"
     munge_file="${CT_BUILD_DIR}/munge-uClibc-config.sed"
 
+    # Hack our target in the config file.
+    # Also remove stripping: its the responsibility of the
+    # firmware builder to strip or not.
     cat > "${munge_file}" <<-ENDSED
 s/^(TARGET_.*)=y$/# \\1 is not set/
 s/^# TARGET_${CT_KERNEL_ARCH} is not set/TARGET_${CT_KERNEL_ARCH}=y/
 s/^TARGET_ARCH=".*"/TARGET_ARCH="${CT_KERNEL_ARCH}"/
+s/.*(DOSTRIP).*/# \\1 is not set/
 ENDSED
 
+    # Accomodate for old and new uClibc versions, where the
+    # way to select between big/little endian has changed
     case "${CT_ARCH_BE},${CT_ARCH_LE}" in
         y,) cat >> "${munge_file}" <<-ENDSED
-s/.*(ARCH_BIG_ENDIAN).*/\\1=y/
 s/.*(ARCH_LITTLE_ENDIAN).*/# \\1 is not set/
+s/.*(ARCH_BIG_ENDIAN).*/\\1=y/
+s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/# \\1 is not set/
+s/.*(ARCH_WANTS_BIG_ENDIAN).*/\\1=y/
 ENDSED
         ;;
         ,y) cat >> "${munge_file}" <<-ENDSED
-s/.*(ARCH_BIG_ENDIAN).*/# \\1 is not set/
 s/.*(ARCH_LITTLE_ENDIAN).*/\\1=y/
+s/.*(ARCH_BIG_ENDIAN).*/# \\1 is not set/
+s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/\\1=y/
+s/.*(ARCH_WANTS_BIG_ENDIAN).*/# \\1 is not set/
 ENDSED
         ;;
     esac
 
+    # Accomodate for old and new uClibc version, where the
+    # way to select between hard/soft float has changed
     case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in
         y,) cat >> "${munge_file}" <<-ENDSED
 s/.*(HAS_FPU).*/\\1=y/
+s/.*(UCLIBC_HAS_FPU).*/\\1=y/
 ENDSED
             ;;
         ,y) cat >> "${munge_file}" <<-ENDSED
 s/.*(HAS_FPU).*/\\# \\1 is not set/
+s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/
 ENDSED
             ;;
     esac
@@ -191,12 +205,19 @@ s/^KERNEL_HEADERS=".*"/KERNEL_HEADERS="${quoted_headers_dir}"/
 s/^UCLIBC_DOWNLOAD_PREGENERATED_LOCALE=y/\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE is not set/
 ENDSED
 
-    # Hack our -pipe into WARNINGS, which will be internally incorporated to
-    # CFLAGS. This a dirty hack, but yet needed
     if [ "${CT_USE_PIPES}" = "y" ]; then
-        cat >> "${munge_file}" <<-ENDSED
+        if grep UCLIBC_EXTRA_CFLAGS extra/Configs/Config.in >/dev/null 2>&1; then
+            # Good, there is special provision for such things as -pipe!
+            cat >> "${munge_file}" <<-ENDSED
+s/^(UCLIBC_EXTRA_CFLAGS=".*)"$/\\1 -pipe"/
+ENDSED
+        else
+            # Hack our -pipe into WARNINGS, which will be internally incorporated to
+            # CFLAGS. This a dirty hack, but yet needed
+            cat >> "${munge_file}" <<-ENDSED
 s/^(WARNINGS=".*)"$/\\1 -pipe"/
 ENDSED
+        fi
     fi
 
     # Force on options needed for C++ if we'll be making a C++ compiler.
@@ -227,6 +248,7 @@ s/^DODEBUG_PT=y/# DODEBUG_PT is not set/
 s/^DOASSERTS=y/# DOASSERTS is not set/
 s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/
 s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/
+s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/
 ENDSED
         ;;
       1)
@@ -237,6 +259,7 @@ s/^DODEBUG_PT=y/# DODEBUG_PT is not set/
 s/^DOASSERTS=y/# DOASSERTS is not set/
 s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/
 s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/
+s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/
 ENDSED
         ;;
       2)
@@ -247,6 +270,7 @@ s/^# DODEBUG_PT is not set.*/DODEBUG_PT=y/
 s/^# DOASSERTS is not set.*/DOASSERTS=y/
 s/^# SUPPORT_LD_DEBUG is not set.*/SUPPORT_LD_DEBUG=y/
 s/^# SUPPORT_LD_DEBUG_EARLY is not set.*/SUPPORT_LD_DEBUG_EARLY=y/
+s/^# UCLIBC_MALLOC_DEBUGGING is not set/UCLIBC_MALLOC_DEBUGGING=y/
 ENDSED
         ;;
     esac
diff --git a/scripts/build/libfloat.sh b/scripts/build/libfloat.sh
index e80e393..b557404 100644
--- a/scripts/build/libfloat.sh
+++ b/scripts/build/libfloat.sh
@@ -14,7 +14,7 @@ do_libfloat_get() {
                ftp://ftp.de.debian.org/debian/pool/main/libf/libfloat
     CT_Pushd "${CT_TARBALLS_DIR}"
     ext=`CT_GetFileExtension "${libfloat_file}"`
-    ln -s "${libfloat_file}${ext}" "${CT_LIBFLOAT_FILE}${ext}"
+    ln -svf "${libfloat_file}${ext}" "${CT_LIBFLOAT_FILE}${ext}" |CT_DoLog DEBUG
     CT_Popd
 }
 
diff --git a/scripts/saveSample.sh b/scripts/saveSample.sh
index d7f27f3..1771ba8 100755
--- a/scripts/saveSample.sh
+++ b/scripts/saveSample.sh
@@ -30,7 +30,13 @@ CT_DoBuildTargetTriplet
 . "${CT_TOP_DIR}/.config"
 
 # Create the sample directory
-[ -d "${CT_TOP_DIR}/samples/${CT_TARGET}" ] || svn mkdir "${CT_TOP_DIR}/samples/${CT_TARGET}" >/dev/null 2>&1
+# In case it was manually made, add it to svn
+if [ -d "${CT_TOP_DIR}/samples/${CT_TARGET}" ]; then
+    # svn won't fail when adding a directory already managed by svn
+    svn add "${CT_TOP_DIR}/samples/${CT_TARGET}" >/dev/null 2>&1
+else
+    svn mkdir "${CT_TOP_DIR}/samples/${CT_TARGET}" >/dev/null 2>&1
+fi
 
 # Save the crosstool-NG config file
 cp "${CT_TOP_DIR}/.config" "${CT_TOP_DIR}/samples/${CT_TARGET}/crosstool.config"
@@ -42,7 +48,7 @@ CT_DoAddFileToSample() {
     source="$1"
     dest="$2"
     inode_s=`ls -i "${source}"`
-    inode_d=`ls -i "${dest}"`
+    inode_d=`ls -i "${dest}" 2>/dev/null || true`
     if [ "${inode_s}" != "${inode_d}" ]; then
         cp "${source}" "${dest}"
     fi