From 493672e977460426013e6ad5fef4160a98ec79e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20TH=C3=89BAUDEAU=22?=
 <benoit.thebaudeau@advansee.com>
Date: Tue, 31 May 2011 20:39:42 +0200
Subject: binutils: use the PKGVERSION and BUGURL options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 51ba71a..7275eaf 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -17,22 +17,27 @@ config BINUTILS_V_2_21
 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_VERSION
 
 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_GOLD_SUPPORTS_ARCH
 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 --git a/config/toolchain.in b/config/toolchain.in
index 4fdea14..0cc4f0f 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -73,7 +73,7 @@ config TOOLCHAIN_PKGVERSION
     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 --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}                                     \
-- 
cgit v0.10.2-6-g49f6