summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/addToolVersion.sh16
-rw-r--r--scripts/build/libc/glibc-eglibc.sh-common9
2 files changed, 23 insertions, 2 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index 1efc89e..dbd1300 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -137,6 +137,22 @@ addToolVersion() {
SedExpr1="${SedExpr1}\n select BINUTILS_2_18_or_later"
fi
;;
+ eglibc)
+ # Extract 'M'ajor and 'm'inor from version string
+ ver_M=$(getVersionField "${version}" . 1)
+ ver_m=$(getVersionField "${version}" . 2)
+ if [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 13 \) ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_13_or_later"
+ elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 12 \) ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_12_or_later"
+ elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 11 \) ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_11_or_later"
+ elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 10 \) ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_10_or_later"
+ elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 9 \) ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_9_or_later"
+ fi
+ ;;
uClibc)
# uClibc-0.9.30 and above need some love
ver_M=$(getVersionField "${version}" . 1)
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 8306f82..a321b7a 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -234,6 +234,11 @@ do_libc() {
*) extra_config+=("--enable-add-ons=$(do_libc_add_ons_list ,)");;
esac
+ if [ "${CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
+ [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
+ [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
+ fi
+
extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}"
touch config.cache
@@ -245,7 +250,7 @@ do_libc() {
# Pre-seed the configparms file with values from the config option
printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
- cross_cc=$(CT_Which "${CT_TARGET}-gcc")
+ cross_cc=$(CT_Which "${CT_TARGET}-gcc")
CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'"
CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'"
@@ -296,7 +301,7 @@ do_libc() {
--with-headers="${CT_HEADERS_DIR}" \
"${extra_config[@]}" \
"${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
-
+
# build hacks
case "${CT_ARCH},${CT_ARCH_CPU}" in
powerpc,8??)