# HG changeset patch # User "Yann E. MORIN" # Date 1258399443 -3600 # Node ID 8aa1d1051a6a51244df6ef1d72aa6ca51da234a2 # Parent 60446d2e5660ca85a6f1b31bc2abf30b98657f0b libc/glibc: allow more than one line in configparms diff -r 60446d2e5660 -r 8aa1d1051a6a config/libc/glibc-eglibc.in-common --- a/config/libc/glibc-eglibc.in-common Wed Nov 11 14:44:53 2009 -0800 +++ b/config/libc/glibc-eglibc.in-common Mon Nov 16 20:24:03 2009 +0100 @@ -38,8 +38,8 @@ Unless you are building a toolchain for sh3/4, you should leave that empty. - Note: this is awkward, and doesn't work well if you need more than one - line in configparms + Note: If you need to pass more than one value, separate them with + '\n'. Eg.: var1=val1\nvar2=val2 config LIBC_GLIBC_EXTRA_CFLAGS string diff -r 60446d2e5660 -r 8aa1d1051a6a scripts/build/libc/glibc.sh --- a/scripts/build/libc/glibc.sh Wed Nov 11 14:44:53 2009 -0800 +++ b/scripts/build/libc/glibc.sh Mon Nov 16 20:24:03 2009 +0100 @@ -141,7 +141,7 @@ extra_config+=("$(do_libc_min_kernel_config)") # Pre-seed the configparms file with values from the config option - echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms cross_cc=$(CT_Which "${CT_TARGET}-gcc") CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" @@ -309,7 +309,7 @@ CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" # Pre-seed the configparms file with values from the config option - echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms echo "libc_cv_forced_unwind=yes" > config.cache echo "libc_cv_c_cleanup=yes" >> config.cache @@ -418,7 +418,7 @@ CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" # Pre-seed the configparms file with values from the config option - echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms # For glibc 2.3.4 and later we need to set some autoconf cache # variables, because nptl/sysdeps/pthread/configure.in does not