# HG changeset patch
# User "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
# Date 1306867182 -7200
# Node ID 58a28561f1bc870f844aafdac2c01ee0858dea3e
# Parent  481cd34691f02251dfd93420f74d8ba06e3c4504
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>

diff -r 481cd34691f0 -r 58a28561f1bc config/binutils/binutils.in
--- a/config/binutils/binutils.in	Tue May 31 20:12:35 2011 +0200
+++ b/config/binutils/binutils.in	Tue May 31 20:39:42 2011 +0200
@@ -17,22 +17,27 @@
 config BINUTILS_V_2_20_1
     bool
     prompt "2.20.1"
+    select BINUTILS_2_20_or_later
 
 config BINUTILS_V_2_20
     bool
     prompt "2.20"
+    select BINUTILS_2_20_or_later
 
 config BINUTILS_V_2_19_1
     bool
     prompt "2.19.1"
+    select BINUTILS_2_19_or_later
 
 config BINUTILS_V_2_19
     bool
     prompt "2.19"
+    select BINUTILS_2_19_or_later
 
 config BINUTILS_V_2_18
     bool
     prompt "2.18"
+    select BINUTILS_2_18_or_later
 
 config BINUTILS_V_2_17
     bool
@@ -61,9 +66,22 @@
 
 config BINUTILS_2_21_or_later
     bool
+    select BINUTILS_2_20_or_later
     select BINUTILS_HAS_GOLD
     select BINUTILS_HAS_PLUGINS
 
+config BINUTILS_2_20_or_later
+    bool
+    select BINUTILS_2_19_or_later
+
+config BINUTILS_2_19_or_later
+    bool
+    select BINUTILS_2_18_or_later
+
+config BINUTILS_2_18_or_later
+    bool
+    select BINUTILS_HAS_PKGVERSION_BUGURL
+
 config BINUTILS_HAS_GOLD
     bool
 
@@ -73,6 +91,9 @@
 config BINUTILS_HAS_PLUGINS
     bool
 
+config BINUTILS_HAS_PKGVERSION_BUGURL
+    bool
+
 # Only these architectures have support in gold
 config ARCH_arm
     select BINUTILS_GOLD_SUPPORTS_ARCH
diff -r 481cd34691f0 -r 58a28561f1bc config/toolchain.in
--- a/config/toolchain.in	Tue May 31 20:12:35 2011 +0200
+++ b/config/toolchain.in	Tue May 31 20:39:42 2011 +0200
@@ -73,7 +73,7 @@
     help
       Specify a string that identifies your package. You may wish to include
       a build number or build date. This version string will be included in
-      the output of gcc --version.
+      the output of gcc --version, and also in binutils.
 
       This is passed to the configure flag --with-pkgversion.
 
diff -r 481cd34691f0 -r 58a28561f1bc scripts/addToolVersion.sh
--- a/scripts/addToolVersion.sh	Tue May 31 20:12:35 2011 +0200
+++ b/scripts/addToolVersion.sh	Tue May 31 20:39:42 2011 +0200
@@ -123,6 +123,20 @@
                 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 -r 481cd34691f0 -r 58a28561f1bc scripts/build/binutils/binutils.sh
--- a/scripts/build/binutils/binutils.sh	Tue May 31 20:12:35 2011 +0200
+++ b/scripts/build/binutils/binutils.sh	Tue May 31 20:39:42 2011 +0200
@@ -55,6 +55,10 @@
     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 @@
         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}                                     \