diff options
| author |   Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> | 2011-05-31 18:39:42 (GMT) |
|---|---|---|
| committer | Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> | 2011-05-31 18:39:42 (GMT) |
| commit | 493672e977460426013e6ad5fef4160a98ec79e1 (patch) | |
| tree | a6fad64b06c5f1a377764bedd742042f7a7b511f /scripts | |
| parent | 35fe8a047d4a0d14c74708434e2e4ba2d845681d (diff) | |
binutils: use the PKGVERSION and BUGURL options
This patch makes binutils benefit from the TOOLCHAIN_PKGVERSION and
TOOLCHAIN_BUGURL options.
Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 14 | ||||
| -rw-r--r-- | scripts/build/binutils/binutils.sh | 10 |
2 files changed, 24 insertions, 0 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index e5f083d..1efc89e 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -123,6 +123,20 @@ addToolVersion() { SedExpr1="${SedExpr1}\n select CC_GCC_4_2" fi ;; + binutils) + # 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 21 \) ]; then + SedExpr1="${SedExpr1}\n select BINUTILS_2_21_or_later" + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 20 \) ]; then + SedExpr1="${SedExpr1}\n select BINUTILS_2_20_or_later" + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 19 \) ]; then + SedExpr1="${SedExpr1}\n select BINUTILS_2_19_or_later" + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 18 \) ]; then + SedExpr1="${SedExpr1}\n select BINUTILS_2_18_or_later" + fi + ;; uClibc) # uClibc-0.9.30 and above need some love ver_M=$(getVersionField "${version}" . 1) diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index a44899d..e2be70d 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -55,6 +55,10 @@ do_binutils() { if [ "${CT_BINUTILS_PLUGINS}" = "y" ]; then extra_config+=( --enable-plugins ) fi + if [ "${CT_BINUTILS_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 CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" @@ -141,6 +145,12 @@ do_binutils_target() { CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target" CT_DoLog EXTRA "Configuring binutils for target" + + if [ "${CT_BINUTILS_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 + CT_DoExecLog CFG \ "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ --build=${CT_BUILD} \ |