From 930fa77076874655179341433b4f8066deefb0b8 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 9 Nov 2015 22:47:17 -0800
Subject: uClibc: Reduce supported versions

This commit reduces the number of supported versions to:

* 0.9.33.2
* custom location

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
 scripts/addToolVersion.sh    | 9 +++------
 scripts/build/libc/uClibc.sh | 9 +--------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'scripts')

diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index 37c3ae18..9c6c4c60 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -133,15 +133,12 @@ addToolVersion() {
             fi
             ;;
         uClibc)
-            # uClibc-0.9.30 and above need some love
+            # uClibc-0.9.33.2 needs some love
             ver_M=$(getVersionField "${version}" . 1)
             ver_m=$(getVersionField "${version}" . 2)
             ver_p=$(getVersionField "${version}" . 3)
-            if [    ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 30 \
-                 -o ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 31 ]; then
-                SedExpr1="${SedExpr1}\n    select LIBC_UCLIBC_0_9_30_or_later"
-            elif [  ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 32 ]; then
-                SedExpr1="${SedExpr1}\n    select LIBC_UCLIBC_0_9_32_or_later"
+            elif [  ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 33 ]; then
+                SedExpr1="${SedExpr1}\n    select LIBC_UCLIBC_0_9_33_2_or_later"
             fi
             ;;
         gdb)
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index eac32dae..914fd5a7 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -71,7 +71,6 @@ do_libc_check_config() {
 
 # Build and install headers and start files
 do_libc_start_files() {
-    local install_rule
     local cross
 
     CT_DoStep INFO "Installing C library headers"
@@ -111,19 +110,13 @@ do_libc_start_files() {
          LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
          headers
 
-    if [ "${CT_LIBC_UCLIBC_0_9_30_or_later}" = "y" ]; then
-        install_rule=install_headers
-    else
-        install_rule=install_dev
-    fi
-
     CT_DoLog EXTRA "Installing headers"
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_VERBOSITY}                        \
          CROSS_COMPILE="${cross}"                           \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
-         ${install_rule}
+         install_headers
 
     if [ "${CT_THREADS}" = "nptl" ]; then
         CT_DoLog EXTRA "Building start files"
-- 
cgit v1.2.3


From c4d14a97ad840891cfd3e088c6d8685e1c763ab6 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 9 Nov 2015 22:55:32 -0800
Subject: functions: Add global functions for manipulating kconfig options

This commit adds 4 new functions to aid in the process of managing a
kconfig .config file:

* CT_KconfigSetOption <option> <value> <file>
* CT_KconfigEnableOption <option> <file>
* CT_KconfigDisableOption <option> <file>
* CT_KconfigDeleteOption <option> <file>

(akin to how buildroot manages the uClibc.config)

These functions are global so that we can manage any component that also
uses kconfig, or to be able to use it internally on Crosstool-NG's
kconfig files.

Last but not least, be consistent and update sed to be ${sed}!

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
 scripts/functions | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index 2261b8d0..f09df54b 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -842,7 +842,7 @@ CT_GetGit() {
     local url="${3}"
     local _out_cset="${4}"
 
-    local ref=$(echo "${cset_or_ref}" | sed -n 's/^ref=\(.*\)/\1/p')
+    local ref=$(echo "${cset_or_ref}" | ${sed} -n 's/^ref=\(.*\)/\1/p')
     if [ -n "$ref" ]; then
         local matches=$(git ls-remote --exit-code "$url" --refs "${ref}")
         local result=$?
@@ -1428,3 +1428,51 @@ CT_DoLoadState(){
     exec >>"${tmp_log_file}"
     rm -f "${state_dir}/tail.log"
 }
+
+# This function sets a kconfig option to a specific value in a .config file
+# Usage: CT_KconfigSetOption <option> <value> <file>
+CT_KconfigSetOption() {
+    option="$1"
+    value="$2"
+    file="$3"
+
+    ${grep} -E -q "^${option}=.*" "${file}" && \
+        ${sed} -i -r -e "s;^${option}=.*$;${option}=${value};" "${file}" || \
+    ${grep} -E -q "^# ${option} is not set$" "${file}" && \
+        ${sed} -i -r -e "s;^# ${option} is not set$;${option}=${value};" "${file}" || \
+    echo "${option}=${value}" >> "${file}"
+}
+
+# This function enables a kconfig option to '=y' in a .config file
+# Usage: CT_KconfigEnableOption <option> <file>
+CT_KconfigEnableOption() {
+    option="$1"
+    file="$2"
+
+    CT_KconfigSetOption "${option}" "y" "${file}"
+}
+
+# This function disables a kconfig option in a .config file
+# Usage: CT_KconfigDisableOption <option> <file>
+CT_KconfigDisableOption() {
+    option="${1}"
+    file="${2}"
+
+    ${grep} -E -q "^# ${option} is not set$" "${file}" || \
+    ${grep} -E -q "^${option}=.*$" "${file}" && \
+        ${sed} -i -r -e "s;^${option}=.*$;# ${option} is not set;" "${file}" || \
+    echo "# ${option} is not set" >> "${file}"
+}
+
+# This function deletes a kconfig option in a .config file, no matter if it
+# is set or commented out.
+# Usage: CT_KconfigDeleteOption <option> <file>
+CT_KconfigDeleteOption() {
+    option="${1}"
+    file="${2}"
+
+    ${grep} -E -q "^# ${option} is not set$" "${file}" && \
+        ${sed} -i -r -e "/^# ${option} is not set$/d" "${file}" || \
+    ${grep} -E -q "^${option}=.*$" "${file}" && \
+        ${sed} -i -r -e "/^${option}=.*$/d" "${file}" || true
+}
-- 
cgit v1.2.3


From 1c924f06fa2890b40d1716564c83aac644392c65 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 9 Nov 2015 23:50:13 -0800
Subject: uClibc: rewrite mungeuClibcConfig to manage_uClibc_config

This commit updates uClibc to use the new CT_Kconfig options from the
previous commit. The older sed method of sanity checking the uClibc
.config was error prone and clumsy.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
 scripts/build/libc/uClibc.sh | 396 +++++++++++++++++++------------------------
 1 file changed, 177 insertions(+), 219 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 914fd5a7..08365524 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -58,13 +58,13 @@ do_libc_check_config() {
 
     CT_TestOrAbort "You did not provide a uClibc config file!" -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" -a -f "${CT_LIBC_UCLIBC_CONFIG_FILE}"
 
-    if grep -E '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then
+    if ${grep} -E '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then
         CT_DoLog WARN "Your uClibc version refers to the kernel _sources_, which is bad."
         CT_DoLog WARN "I can't guarantee that our little hack will work. Please try to upgrade."
     fi
 
-    CT_DoLog EXTRA "Munging uClibc configuration"
-    mungeuClibcConfig "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_CONFIG_DIR}/uClibc.config"
+    CT_DoLog EXTRA "Manage uClibc configuration"
+    manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_CONFIG_DIR}/uClibc.config"
 
     CT_EndStep
 }
@@ -98,6 +98,7 @@ do_libc_start_files() {
     CT_DoLog EXTRA "Applying configuration"
     CT_DoYes "" |CT_DoExecLog ALL                                   \
                  make CROSS_COMPILE="${cross}"                      \
+                 UCLIBC_EXTRA_CFLAGS="-pipe"                        \
                  PREFIX="${CT_SYSROOT_DIR}/"                        \
                  LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
                  oldconfig
@@ -106,6 +107,7 @@ do_libc_start_files() {
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_VERBOSITY}                        \
          CROSS_COMPILE="${cross}"                           \
+         UCLIBC_EXTRA_CFLAGS="-pipe"                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
          headers
@@ -114,6 +116,7 @@ do_libc_start_files() {
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_VERBOSITY}                        \
          CROSS_COMPILE="${cross}"                           \
+         UCLIBC_EXTRA_CFLAGS="-pipe"                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
          install_headers
@@ -123,6 +126,7 @@ do_libc_start_files() {
         CT_DoExecLog ALL                                        \
         make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}}           \
              CROSS_COMPILE="${cross}"                           \
+             UCLIBC_EXTRA_CFLAGS="-pipe"                        \
              PREFIX="${CT_SYSROOT_DIR}/"                        \
              STRIPTOOL=true                                     \
              ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -174,6 +178,7 @@ do_libc() {
     CT_DoLog EXTRA "Applying configuration"
     CT_DoYes "" |CT_DoExecLog CFG                                   \
                  make CROSS_COMPILE=${CT_TARGET}-                   \
+                 UCLIBC_EXTRA_CFLAGS="-pipe"                        \
                  PREFIX="${CT_SYSROOT_DIR}/"                        \
                  LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
                  oldconfig
@@ -185,6 +190,7 @@ do_libc() {
     CT_DoExecLog ALL                                        \
     make -j1                                                \
          CROSS_COMPILE=${CT_TARGET}-                        \
+         UCLIBC_EXTRA_CFLAGS="-pipe"                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          STRIPTOOL=true                                     \
          ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -193,6 +199,7 @@ do_libc() {
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}}           \
          CROSS_COMPILE=${CT_TARGET}-                        \
+         UCLIBC_EXTRA_CFLAGS="-pipe"                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          STRIPTOOL=true                                     \
          ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -216,6 +223,7 @@ do_libc() {
     CT_DoLog EXTRA "Installing C library"
     CT_DoExecLog ALL                                        \
     make CROSS_COMPILE=${CT_TARGET}-                        \
+         UCLIBC_EXTRA_CFLAGS="-pipe"                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          STRIPTOOL=true                                     \
          ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -227,18 +235,15 @@ do_libc() {
 
 # Initialises the .config file to sensible values
 # $1: original file
-# $2: munged file
-mungeuClibcConfig() {
-    src_config_file="$1"
-    dst_config_file="$2"
-    munge_file="${CT_BUILD_DIR}/munge-uClibc-config.sed"
+# $2: modified file
+manage_uClibc_config() {
+    src="$1"
+    dst="$2"
 
-    # Start with a fresh file
-    rm -f "${munge_file}"
-    touch "${munge_file}"
-
-    # Do it all in a sub-shell, it's easier to redirect output
-    (
+    # Start with fresh files
+    CT_DoExecLog ALL rm -f "${dst}"
+    CT_DoExecLog ALL mkdir -p "$(dirname ${dst})"
+    CT_DoExecLog ALL cp "${src}" "${dst}"
 
     # Hack our target in the config file.
     case "${CT_ARCH}:${CT_ARCH_BITNESS}" in
@@ -250,159 +255,134 @@ mungeuClibcConfig() {
     esac
     # Also remove stripping: its the responsibility of the
     # firmware builder to strip or not.
-    cat <<-ENDSED
-		s/^(TARGET_.*)=y$/# \\1 is not set/
-		s/^# TARGET_${arch} is not set/TARGET_${arch}=y/
-		s/^TARGET_ARCH=".*"/TARGET_ARCH="${arch}"/
-		s/.*(DOSTRIP).*/# \\1 is not set/
-		ENDSED
+    ${sed} -i -r -e '/^TARGET_.*/d' "${dst}"
+    CT_KconfigEnableOption "TARGET_${arch}" "${dst}"
+    CT_KconfigSetOption "TARGET_ARCH" "${arch}" "${dst}"
+    CT_KconfigDisableOption "DOSTRIP" "${dst}"
 
     # Ah. We may one day need architecture-specific handler here...
-    case "${CT_ARCH}" in
-        arm)
-            # Hack the ARM {E,O}ABI into the config file
+    case "${arch}" in
+        arm*)
             if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
-                cat <<-ENDSED
-					s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/
-					s/.*(CONFIG_ARM_EABI).*/\\1=y/
-					ENDSED
+                CT_KconfigDisableOption "CONFIG_ARM_OABI" "${dst}"
+                CT_KconfigEnableOption "CONFIG_ARM_EABI" "${dst}"
             else
-                cat <<-ENDSED
-					s/.*(CONFIG_ARM_OABI).*/\\1=y/
-					s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/
-					ENDSED
+                CT_KconfigDisableOption "CONFIG_ARM_EABI" "${dst}"
+                CT_KconfigEnableOption "CONFIG_ARM_OABI" "${dst}"
             fi
             ;;
-        mips)
+        i386)
+            # FIXME This doesn't cover all cases of x86_32...
+            case ${CT_TARGET_ARCH} in
+                i386)
+                    CT_KconfigEnableOption "CONFIG_386" "${dst}"
+                    ;;
+                i486)
+                    CT_KconfigEnableOption "CONFIG_486" "${dst}"
+                    ;;
+                i586)
+                    CT_KconfigEnableOption "CONFIG_586" "${dst}"
+                    ;;
+                i686)
+                    CT_KconfigEnableOption "CONFIG_686" "${dst}"
+                    ;;
+            esac
+            ;;
+        mips*)
+            CT_KconfigDisableOption "CONFIG_MIPS_O32_ABI" "${dst}"
+            CT_KconfigDisableOption "CONFIG_MIPS_N32_ABI" "${dst}"
+            CT_KconfigDisableOption "CONFIG_MIPS_N64_ABI" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_1" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_2" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_3" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_4" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32R2" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64" "${dst}"
+            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64R2" "${dst}"
             case "${CT_ARCH_mips_ABI}" in
                 32)
-                    cat <<-ENDSED
-						s/.*(CONFIG_MIPS_O32_ABI).*/\\1=y/
-						s/.*(CONFIG_MIPS_N32_ABI).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_N64_ABI).*/# \\1 is not set/
-						ENDSED
+                    CT_KconfigEnableOption "CONFIG_MIPS_O32_ABI" "${dst}"
                     ;;
-                # For n32 and n64, also force the ISA
-                # Not so sure this is pertinent, so it's
-                # commented out for now. It would take a
-                # (MIPS+uClibc) expert to either remove
-                # or re-enable the overrides.
                 n32)
-                    cat <<-ENDSED
-						s/.*(CONFIG_MIPS_O32_ABI).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_N32_ABI).*/\\1=y/
-						s/.*(CONFIG_MIPS_N64_ABI).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_ISA_.*).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_ISA_3).*/\\1=y/
-						ENDSED
+                    CT_KconfigEnableOption "CONFIG_MIPS_N32_ABI" "${dst}"
                     ;;
                 64)
-                    cat <<-ENDSED
-						s/.*(CONFIG_MIPS_O32_ABI).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_N32_ABI).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_N64_ABI).*/\\1=y/
-						s/.*(CONFIG_MIPS_ISA_.*).*/# \\1 is not set/
-						s/.*(CONFIG_MIPS_ISA_MIPS64).*/\\1=y/
-						ENDSED
+                    CT_KconfigEnableOption "CONFIG_MIPS_N64_ABI" "${dst}"
                     ;;
             esac
             ;;
+        powerpc*)
+            CT_KconfigDisableOption "CONFIG_E500" "${dst}"
+            CT_KconfigDisableOption "CONFIG_CLASSIC" "${dst}"
+            CT_KconfigDeleteOption "TARGET_SUBARCH" "${dst}"
+            if [ "${CT_ARCH_powerpc_ABI}" = "spe" ]; then
+                CT_KconfigEnableOption "CONFIG_E500" "${dst}"
+                CT_KconfigSetOption "TARGET_SUBARCH" "e500" "${dst}"
+            else
+                CT_KconfigEnableOption "CONFIG_CLASSIC" "${dst}"
+                CT_KconfigSetOption "TARGET_SUBARCH" "classic" "${dst}"
+            fi
+            ;;
+        sh)
+            # all we really support right now is sh4:32
+            CT_KconfigEnableOption "CONFIG_SH4" "${dst}"
+            ;;
     esac
 
     # Accomodate for old and new uClibc versions, where the
     # way to select between big/little endian has changed
     case "${CT_ARCH_ENDIAN}" in
         big)
-            cat <<-ENDSED
-				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
-        ;;
+            CT_KconfigDisableOption "ARCH_LITTLE_ENDIAN" "${dst}"
+            CT_KconfigDisableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}"
+            CT_KconfigEnableOption "ARCH_BIG_ENDIAN" "${dst}"
+            CT_KconfigEnableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}"
+            ;;
         little)
-            cat <<-ENDSED
-				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
-        ;;
+            CT_KconfigDisableOption "ARCH_BIG_ENDIAN" "${dst}"
+            CT_KconfigDisableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}"
+            CT_KconfigEnableOption "ARCH_LITTLE_ENDIAN" "${dst}"
+            CT_KconfigEnableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}"
+            ;;
     esac
 
     # Accomodate for old and new uClibc versions, where the
     # MMU settings has different config knobs
     if [ "${CT_ARCH_USE_MMU}" = "y" ]; then
-        cat <<-ENDSED
-			s/.*(ARCH_HAS_MMU).*/\\1=y\nARCH_USE_MMU=y/
-			ENDSED
+        CT_KconfigEnableOption "ARCH_USE_MMU" "${dst}"
     else
-        cat <<-ENDSED
-			s/.*(ARCH_HAS_MMU).*/# \\1 is not set/
-			/.*(ARCH_USE_MMU).*/d
-			ENDSED
+        CT_KconfigDisableOption "ARCH_USE_MMU" "${dst}"
     fi
 
     # Accomodate for old and new uClibc version, where the
     # way to select between hard/soft float has changed
     case "${CT_ARCH_FLOAT}" in
         hard|softfp)
-            cat <<-ENDSED
-				s/^[^_]*(HAS_FPU).*/\\1=y/
-				s/.*(UCLIBC_HAS_FPU).*/\\1=y/
-				ENDSED
+            CT_KconfigEnableOption "UCLIBC_HAS_FPU" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}"
             ;;
         soft)
-            cat <<-ENDSED
-				s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/
-				s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/
-				ENDSED
+            CT_KconfigDisableOption "UCLIBC_HAS_FPU" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}"
+            CT_KconfigEnableOption "DO_C99_MATH" "${dst}"
             ;;
     esac
     if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then
-        cat <<-ENDSED
-			s/.*(UCLIBC_HAS_FENV).*/\\1=y/
-			ENDSED
+        CT_KconfigEnableOption "UCLIBC_HAS_FENV" "${dst}"
     fi
 
     # We always want ctor/dtor
-    cat <<-ENDSED
-		s/^# (UCLIBC_CTOR_DTOR) is not set/\\1=y/
-		ENDSED
+    CT_KconfigEnableOption "UCLIBC_CTOR_DTOR" "${dst}"
 
     # Change paths to work with crosstool-NG
-    # From http://www.uclibc.org/cgi-bin/viewcvs.cgi?rev=16846&view=rev
-    #  " we just want the kernel headers, not the whole kernel source ...
-    #  " so people may need to update their paths slightly
-    quoted_kernel_source=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/include/?$,,; s,/,\\/,g;')
-    quoted_headers_dir=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/,\\/,g;')
-    # CROSS_COMPILER_PREFIX is left as is, as the CROSS_COMPILE parameter is forced on the command line
-    # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, wich is the correct value of ${PREFIX}/${TARGET}
-    # Some (old) versions of uClibc use KERNEL_SOURCE (which is _wrong_), and
-    # newer versions use KERNEL_HEADERS (which is right).
-    cat <<-ENDSED
-		s/^DEVEL_PREFIX=".*"/DEVEL_PREFIX="\\/usr\\/"/
-		s/^RUNTIME_PREFIX=".*"/RUNTIME_PREFIX="\\/"/
-		s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="\\/lib\\/"/
-		s/^KERNEL_SOURCE=".*"/KERNEL_SOURCE="${quoted_kernel_source}"/
-		s/^KERNEL_HEADERS=".*"/KERNEL_HEADERS="${quoted_headers_dir}"/
-		s/^UCLIBC_DOWNLOAD_PREGENERATED_LOCALE=y/\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE is not set/
-		ENDSED
-
-    if [ "${CT_USE_PIPES}" = "y" ]; then
-        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 <<-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 <<-ENDSED
-				s/^(WARNINGS=".*)"$/\\1 -pipe"/
-				ENDSED
-        fi
-    fi
+    #
+    # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX,
+    # which is the correct value of ${PREFIX}/${TARGET}.
+    CT_KconfigSetOption "DEVEL_PREFIX" "\"/usr/\"" "${dst}"
+    CT_KconfigSetOption "RUNTIME_PREFIX" "\"/\"" "${dst}"
+    CT_KconfigSetOption "SHARED_LIB_LOADER_PREFIX" "\"/lib/\"" "${dst}"
+    CT_KconfigSetOption "KERNEL_HEADERS" "\"${CT_HEADERS_DIR}\"" "${dst}"
 
     # Locales support
     # Note that the two PREGEN_LOCALE and the XLOCALE lines may be missing
@@ -411,81 +391,74 @@ mungeuClibcConfig() {
     # arrangements.  Note that having the uClibc Makefile download the
     # pregenerated locales is not compatible with crosstool; besides,
     # crosstool downloads them as part of getandpatch.sh.
+    CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE" "${dst}"
     case "${CT_LIBC_UCLIBC_LOCALES}:${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" in
         :*)
             ;;
         y:)
-            cat <<-ENDSED
-				s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\
-				# UCLIBC_PREGENERATED_LOCALE_DATA is not set\\
-				# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\
-				# UCLIBC_HAS_XLOCALE is not set/
-				ENDSED
+            CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}"
+            CT_KconfigDeleteOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}"
+            CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" \
+                "${dst}"
+            CT_KconfigDeleteOption "UCLIBC_HAS_XLOCALE" "${dst}"
             ;;
         y:y)
-            cat <<-ENDSED
-				s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\
-				UCLIBC_PREGENERATED_LOCALE_DATA=y\\
-				# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\
-				# UCLIBC_HAS_XLOCALE is not set/
-				ENDSED
+            CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}"
+            CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" \
+                "${dst}"
+            CT_KconfigDeleteOption "UCLIBC_HAS_XLOCALE" "${dst}"
             ;;
     esac
 
     # WCHAR support
-    if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ] ; then
-        cat <<-ENDSED
-			s/^.*UCLIBC_HAS_WCHAR.*/UCLIBC_HAS_WCHAR=y/
-			ENDSED
+    if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ]; then
+        CT_KconfigEnableOption "UCLIBC_HAS_WCHAR" "${dst}"
     else
-        cat <<-ENDSED
-			s/^.*UCLIBC_HAS_WCHAR.*/UCLIBC_HAS_WCHAR=n/
-			ENDSED
+        CT_KconfigDisableOption "UCLIBC_HAS_WCHAR" "${dst}"
     fi
 
     # Force on options needed for C++ if we'll be making a C++ compiler.
     # I'm not sure locales are a requirement for doing C++... Are they?
     if [ "${CT_CC_LANG_CXX}" = "y" ]; then
-        cat <<-ENDSED
-			s/^# DO_C99_MATH is not set/DO_C99_MATH=y/
-			s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/
-			ENDSED
+        CT_KconfigEnableOption "DO_C99_MATH" "${dst}"
+        CT_KconfigEnableOption "UCLIBC_HAS_GNU_GETOPT" "${dst}"
+    fi
+
+    # Stack Smash Protection (SSP)
+    if [ "${CT_CC_GCC_LIBSSP}" = "y" ]; then
+        CT_KconfigEnableOption "UCLIBC_HAS_SSP" "${dst}"
+        CT_KconfigEnableOption "UCLIBC_BUILD_SSP" "${dst}"
+    else
+        CT_KconfigDisableOption "UCLIBC_HAS_SSP" "${dst}"
+        CT_KconfigDisableOption "UCLIBC_BUILD_SSP" "${dst}"
     fi
 
     # Push the threading model
     case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
         none:)
-            cat <<-ENDSED
-				s/^UCLIBC_HAS_THREADS=y/# UCLIBC_HAS_THREADS is not set/
-				s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
-				s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
-				s/^UCLIBC_HAS_THREADS_NATIVE=y/# UCLIBC_HAS_THREADS_NATIVE is not set/
-				ENDSED
+            CT_KconfigDisableOption "UCLIBC_HAS_THREADS" "${dst}"
+            CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+            CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+            CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         linuxthreads:old)
-            cat <<-ENDSED
-				s/^# UCLIBC_HAS_THREADS is not set/UCLIBC_HAS_THREADS=y/
-				s/^# LINUXTHREADS_OLD is not set/LINUXTHREADS_OLD=y/
-				s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
-				s/^UCLIBC_HAS_THREADS_NATIVE=y/# UCLIBC_HAS_THREADS_NATIVE is not set/
-				ENDSED
+            CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+            CT_KconfigEnableOption "LINUXTHREADS_OLD" "${dst}"
+            CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+            CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         linuxthreads:new)
-            cat <<-ENDSED
-				s/^# UCLIBC_HAS_THREADS is not set/UCLIBC_HAS_THREADS=y/
-				s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
-				s/^# LINUXTHREADS_NEW is not set/LINUXTHREADS_NEW=y/
-				s/^UCLIBC_HAS_THREADS_NATIVE=y/# UCLIBC_HAS_THREADS_NATIVE is not set/
-				ENDSED
+            CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+            CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+            CT_KconfigEnableOption "LINUXTHREADS_NEW" "${dst}"
+            CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         nptl:)
-            cat <<-ENDSED
-				s/^HAS_NO_THREADS=y/# HAS_NO_THREADS is not set/
-				s/^UCLIBC_HAS_THREADS=y/# UCLIBC_HAS_THREADS is not set/
-				s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
-				s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
-				s/^# UCLIBC_HAS_THREADS_NATIVE is not set/UCLIBC_HAS_THREADS_NATIVE=y/
-				ENDSED
+            CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+            CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+            CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         *)
             CT_Abort "Incorrect thread settings: CT_THREADS='${CT_THREAD}' CT_LIBC_UCLIBC_LNXTHRD='${CT_LIBC_UCLIBC_LNXTHRD}'"
@@ -493,58 +466,43 @@ mungeuClibcConfig() {
     esac
 
     # Always build the libpthread_db
-    cat <<-ENDSED
-		s/^# PTHREADS_DEBUG_SUPPORT is not set.*/PTHREADS_DEBUG_SUPPORT=y/
-		ENDSED
+    CT_KconfigEnableOption "PTHREADS_DEBUG_SUPPORT" "${dst}"
 
     # Force on debug options if asked for
     case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in
-      0)
-        cat <<-ENDSED
-			s/^DODEBUG=y/# DODEBUG is not set/
-			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)
-        cat <<-ENDSED
-			s/^# DODEBUG is not set.*/DODEBUG=y/
-			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)
-        cat <<-ENDSED
-			s/^# DODEBUG is not set.*/DODEBUG=y/
-			s/^DODEBUG_PT=y/# DODEBUG_PT is not set/
-			s/^# DOASSERTS is not set.*/DOASSERTS=y/
-			s/^# SUPPORT_LD_DEBUG is not set.*/SUPPORT_LD_DEBUG=y/
-			s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/
-			s/^# UCLIBC_MALLOC_DEBUGGING is not set/UCLIBC_MALLOC_DEBUGGING=y/
-			ENDSED
-        ;;
-      3)
-        cat <<-ENDSED
-			s/^# DODEBUG is not set.*/DODEBUG=y/
-			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
-        ;;
+        0)
+            CT_KconfigDisableOption "DODEBUG" "${dst}"
+            CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+            CT_KconfigDisableOption "DOASSERTS" "${dst}"
+            CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
+            CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+            CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+            ;;
+        1)
+            CT_KconfigEnableOption "DODEBUG" "${dst}"
+            CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+            CT_KconfigDisableOption "DOASSERTS" "${dst}"
+            CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
+            CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+            CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+            ;;
+        2)
+            CT_KconfigEnableOption "DODEBUG" "${dst}"
+            CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+            CT_KconfigEnableOption "DOASSERTS" "${dst}"
+            CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}"
+            CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+            ;;
+        3)
+            CT_KconfigEnableOption "DODEBUG" "${dst}"
+            CT_KconfigEnableOption "DODEBUG_PT" "${dst}"
+            CT_KconfigEnableOption "DOASSERTS" "${dst}"
+            CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}"
+            CT_KconfigEnableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
+            ;;
     esac
-
-    # And now, this is the end
-    ) >>"${munge_file}"
-
-    sed -r -f "${munge_file}" "${src_config_file}" >"${dst_config_file}"
 }
 
 do_libc_post_cc() {
-- 
cgit v1.2.3


From 21a448516e2585d581f9dd90c566600831d7c86b Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Tue, 10 Nov 2015 14:41:33 -0800
Subject: uClibc: Add support for uClibc-ng

This commit adds uClibc-ng 1.0.8.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
 config/libc/uClibc.in                              | 18 ++++++++++++
 config/libc/uClibc.in.2                            |  1 +
 .../1.0.8/001-unistd-fix-if-condition.patch        | 34 ++++++++++++++++++++++
 scripts/build/libc/uClibc.sh                       | 27 ++++++++++-------
 4 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 patches/uClibc-ng/1.0.8/001-unistd-fix-if-condition.patch

(limited to 'scripts')

diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index d7ac3af8..dc37f848 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -26,6 +26,11 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config LIBC_UCLIBC_NG_V_1_0_8
+    bool
+    prompt "1.0.8"
+    select LIBC_UCLIBC_NG_1_0_8_or_later
+
 config LIBC_UCLIBC_V_0_9_33_2
     bool
     prompt "0.9.33.2"
@@ -55,8 +60,18 @@ config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "1.0.8" if LIBC_UCLIBC_NG_V_1_0_8
     default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
 
+config LIBC_UCLIBC_NG_1_0_8_or_later
+    bool
+    select LIBC_UCLIBC_NG_1_0_0_or_later
+
+config LIBC_UCLIBC_NG_1_0_0_or_later
+    bool
+    select LIBC_UCLIBC_NG
+    select LIBC_UCLIBC_0_9_33_2_or_later
+
 config LIBC_UCLIBC_0_9_33_2_or_later
     bool
     select LIBC_SUPPORT_THREADS_NATIVE
@@ -65,6 +80,9 @@ config LIBC_UCLIBC_0_9_33_2_or_later
 config LIBC_UCLIBC_PARALLEL
     bool
 
+config LIBC_UCLIBC_NG
+    bool
+
 choice
     bool
     prompt "uClibc verbosity:"
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 6660c434..1e33db47 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -50,6 +50,7 @@ config LIBC_UCLIBC_LOCALES_PREGEN_DATA
     bool
     prompt "Use pregen locales"
     depends on LIBC_UCLIBC_LOCALES
+    depends on ! LIBC_UCLIBC_NG
     default y
     help
       If you see issues with using pre-generated locales data,
diff --git a/patches/uClibc-ng/1.0.8/001-unistd-fix-if-condition.patch b/patches/uClibc-ng/1.0.8/001-unistd-fix-if-condition.patch
new file mode 100644
index 00000000..c321f4e5
--- /dev/null
+++ b/patches/uClibc-ng/1.0.8/001-unistd-fix-if-condition.patch
@@ -0,0 +1,34 @@
+From 1e85892911bf016e9bb2a647b6584cdd806706f8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 3 Nov 2015 15:32:23 +0100
+Subject: [PATCH] unistd: fix #if condition
+
+Commit dfa593d4d881116723a4401b466ea964fb12327b ("syncfs: add system
+call support") modified the #if condition around the definition of the
+syncfs() prototype in a way that doesn't build, causing build failures
+of any file including <unistd.h>:
+
+output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:988:14: error: #if with no expression
+ #if __USE_GNU
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ include/unistd.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 4701dab..40d6abd 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -1073,7 +1073,7 @@ extern char *getpass (const char *__prompt) __nonnull ((1));
+ extern int fsync (int __fd);
+ #endif /* Use BSD || X/Open || Unix98.  */
+ 
+-#if __USE_GNU
++#if defined __USE_GNU
+ /* Make all changes done to all files on the file system associated
+  *    with FD actually appear on disk.  */
+ extern int syncfs (int __fd) __THROW;
+-- 
+2.6.2
+
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 08365524..0f7db19d 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -7,15 +7,22 @@
 uclibc_locales_version=030818
 uclibc_local_tarball="uClibc-locale-${uclibc_locales_version}"
 
-# Download uClibc
-do_libc_get() {
+if [ "${CT_LIBC_UCLIBC_NG}" = "y" ]; then
+    uclibc_name="uClibc-ng"
+    libc_src="http://downloads.uclibc-ng.org/releases/${CT_LIBC_VERSION}"
+else
+    uclibc_name="uClibc"
     libc_src="http://www.uclibc.org/downloads
               http://www.uclibc.org/downloads/old-releases"
+fi
+
+# Download uClibc
+do_libc_get() {
     if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then
-        CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \
+        CT_GetCustom "${uclibc_name}" "${CT_LIBC_VERSION}" \
                      "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}"
     else
-        CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src}
+        CT_GetFile "${uclibc_name}-${CT_LIBC_VERSION}" ${libc_src}
     fi
     # uClibc locales
     if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then
@@ -33,9 +40,9 @@ do_libc_extract() {
     # custom location directory. Just use negate the whole test,
     # to keep it the same as for other components.
     if ! [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
-         -a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then
-        CT_Extract "uClibc-${CT_LIBC_VERSION}"
-        CT_Patch "uClibc" "${CT_LIBC_VERSION}"
+         -a -d "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}" ]; then
+        CT_Extract "${uclibc_name}-${CT_LIBC_VERSION}"
+        CT_Patch "${uclibc_name}" "${CT_LIBC_VERSION}"
     fi
 
     # uClibc locales
@@ -43,7 +50,7 @@ do_libc_extract() {
     # broken, so just link it in place...
     if [    "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y"           \
          -a ! -f "${CT_SRC_DIR}/.${uclibc_local_tarball}.extracted" ]; then
-        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
+        CT_Pushd "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/extra/locale"
         CT_DoExecLog ALL ln -s "${CT_TARBALLS_DIR}/${uclibc_local_tarball}.tgz" .
         CT_Popd
         touch "${CT_SRC_DIR}/.${uclibc_local_tarball}.extracted"
@@ -77,7 +84,7 @@ do_libc_start_files() {
 
     # Simply copy files until uClibc has the ability to build out-of-tree
     CT_DoLog EXTRA "Copying sources to build dir"
-    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"   \
+    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}"   \
                             "${CT_BUILD_DIR}/build-libc-headers"
     cd "${CT_BUILD_DIR}/build-libc-headers"
 
@@ -161,7 +168,7 @@ do_libc() {
 
     # Simply copy files until uClibc has the ability to build out-of-tree
     CT_DoLog EXTRA "Copying sources to build dir"
-    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"   \
+    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}"   \
                             "${CT_BUILD_DIR}/build-libc"
     cd "${CT_BUILD_DIR}/build-libc"
 
-- 
cgit v1.2.3


From a173dfa93937d835b10f3b460faaa652a017f035 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Tue, 10 Nov 2015 15:09:20 -0800
Subject: uClibc: Fall back to default configs if not provided

I've added the .config files to contrib/uClibc-defconfigs from buildroot
to use as default configs if they are not provided in the sample.

If a particular architecture really needs an option set, it should be
either updated in the manange_uClibc_config function in
scripts/build/libc/uClibc.sh or a custom ${uclibc_name}.config should be
added to the sample (usually via `ct-ng saveconfig`).

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
 config/libc/uClibc.in                      |   4 +-
 contrib/uClibc-defconfigs/uClibc-ng.config |  41 +++++
 contrib/uClibc-defconfigs/uClibc.config    | 277 +++++++++++++++++++++++++++++
 scripts/build/libc/uClibc.sh               |   5 +-
 4 files changed, 324 insertions(+), 3 deletions(-)
 create mode 100644 contrib/uClibc-defconfigs/uClibc-ng.config
 create mode 100644 contrib/uClibc-defconfigs/uClibc.config

(limited to 'scripts')

diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index dc37f848..4e57be05 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -149,5 +149,5 @@ config LIBC_UCLIBC_CONFIG_FILE
     default ""
     help
       Path to the configuration file.
-      
-      You _must_ provide one (for now).
+
+      If the file is not provided, we fall back to a default config file.
diff --git a/contrib/uClibc-defconfigs/uClibc-ng.config b/contrib/uClibc-defconfigs/uClibc-ng.config
new file mode 100644
index 00000000..c17603db
--- /dev/null
+++ b/contrib/uClibc-defconfigs/uClibc-ng.config
@@ -0,0 +1,41 @@
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/src/linux/include"
+# LDSO_CACHE_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_RUNPATH_OF_EXECUTABLE=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_HAS_OBSTACK=y
+UCLIBC_HAS_UTMPX=y
+UCLIBC_HAS_UTMP=y
+UCLIBC_SUSV2_LEGACY=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
+UCLIBC_SUSV4_LEGACY=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+UCLIBC_HAS_CTYPE_CHECKED=y
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+# UCLIBC_HAS_REGEX_OLD is not set
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GNU_GLOB=y
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+UCLIBC_HAS_SSP=y
+UCLIBC_BUILD_NOW=y
+# DOSTRIP is not set
diff --git a/contrib/uClibc-defconfigs/uClibc.config b/contrib/uClibc-defconfigs/uClibc.config
new file mode 100644
index 00000000..104eb5c6
--- /dev/null
+++ b/contrib/uClibc-defconfigs/uClibc.config
@@ -0,0 +1,277 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.32-git
+# Fri Jul  9 22:31:59 2010
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+# TARGET_c6x is not set
+
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_CORTEX_M3 is not set
+# CONFIG_ARM_CORTEX_M1 is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+
+# COMPILE_IN_THUMB_MODE is not set
+USE_BX=y
+
+TARGET_SUBARCH=""
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="none"
+FORCE_OPTIONS_FOR_ARCH=y
+#
+# Using ELF file format
+#
+# ARCH_LITTLE_ENDIAN is not set
+# ARCH_BIG_ENDIAN is not set
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# DO_XSI_MATH is not set
+# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS="/usr/src/linux/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+# LDSO_CACHE_SUPPORT is not set
+LDSO_PRELOAD_ENV_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
+# LDSO_NO_CLEANUP is not set
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+LINUXTHREADS_OLD=y
+# LINUXTHREADS_NEW is not set
+# UCLIBC_HAS_THREADS_NATIVE is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+# UCLIBC_HAS_IPV6 is not set
+# UCLIBC_HAS_RPC is not set
+# UCLIBC_HAS_FULL_RPC is not set
+# UCLIBC_HAS_REENTRANT_RPC is not set
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+# UCLIBC_HAS_WCHAR is not set
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+# UCLIBC_HAS_WORDEXP is not set
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+UCLIBC_HAS_UTMPX=y
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+PROPOLICE_BLOCK_ABRT=y
+# PROPOLICE_BLOCK_SEGV is not set
+# UCLIBC_BUILD_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+# DOSTRIP is not set
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 0f7db19d..f49fd082 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -63,7 +63,10 @@ do_libc_extract() {
 do_libc_check_config() {
     CT_DoStep INFO "Checking C library configuration"
 
-    CT_TestOrAbort "You did not provide a uClibc config file!" -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" -a -f "${CT_LIBC_UCLIBC_CONFIG_FILE}"
+    # Use the default config if the user did not provide one.
+    if [ -z "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
+        CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/contrib/uClibc-defconfigs/${uclibc_name}.config"
+    fi
 
     if ${grep} -E '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then
         CT_DoLog WARN "Your uClibc version refers to the kernel _sources_, which is bad."
-- 
cgit v1.2.3