# HG changeset patch
# User "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
# Date 1307114516 -7200
# Node ID b5541f296b921fe7e00748576e85ee1cf1de48a3
# Parent  02b7285c078f27acbe56d5df86e373d7e420c265
kconfig: prepend CT-NG's version tag to PKGVERSION

"crosstool-NG-${CT_VERSION}" is currently the default for TOOLCHAIN_PKGVERSION,
and this options is passed as is to --with-pkgversion.

This patch prepends "crosstool-NG ${CT_VERSION}" to TOOLCHAIN_PKGVERSION before
passing it to --with-pkgversion.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>

diff -r 02b7285c078f -r b5541f296b92 config/toolchain.in
--- a/config/toolchain.in	Thu Jun 02 22:30:55 2011 +0200
+++ b/config/toolchain.in	Fri Jun 03 17:21:56 2011 +0200
@@ -78,13 +78,18 @@
 config TOOLCHAIN_PKGVERSION
     string
     prompt "Toolchain ID string"
-    default "crosstool-NG-${CT_VERSION}"
+    default ""
     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, and also in binutils, eglibc, gdb and
       gdbserver.
 
+      If this string is left empty, the actual package version will be:
+          "crosstool-NG ${CT_VERSION}"
+      Otherwise, it will be:
+          "crosstool-NG ${CT_VERSION} - ${CT_TOOLCHAIN_PKGVERSION}"
+
       This is passed to the configure flag --with-pkgversion.
 
 config TOOLCHAIN_BUGURL
diff -r 02b7285c078f -r b5541f296b92 scripts/build/binutils/binutils.sh
--- a/scripts/build/binutils/binutils.sh	Thu Jun 02 22:30:55 2011 +0200
+++ b/scripts/build/binutils/binutils.sh	Fri Jun 03 17:21:56 2011 +0200
@@ -56,8 +56,8 @@
         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}")
+        extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     fi
 
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
@@ -147,8 +147,8 @@
         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}")
+            extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+            [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
         fi
 
         CT_DoExecLog CFG                                            \
diff -r 02b7285c078f -r b5541f296b92 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Thu Jun 02 22:30:55 2011 +0200
+++ b/scripts/build/cc/gcc.sh	Fri Jun 03 17:21:56 2011 +0200
@@ -161,8 +161,8 @@
 
     if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
         # Bare metal delivers the core compiler as final compiler, so add version info and bugurl
-        [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
-        [ -n "${CT_TOOLCHAIN_BUGURL}" ]     && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
+        extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     fi
 
     if [ "${copy_headers}" = "y" ]; then
@@ -405,8 +405,8 @@
 
     [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
     if [ "${CT_CC_GCC_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}")
+        extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     fi
     case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in
         y)  extra_config+=("--enable-sjlj-exceptions");;
diff -r 02b7285c078f -r b5541f296b92 scripts/build/debug/300-gdb.sh
--- a/scripts/build/debug/300-gdb.sh	Thu Jun 02 22:30:55 2011 +0200
+++ b/scripts/build/debug/300-gdb.sh	Fri Jun 03 17:21:56 2011 +0200
@@ -99,8 +99,8 @@
     esac
 
     if [ "${CT_GDB_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}")
+        extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     fi
 
     if [ "${CT_GDB_CROSS}" = "y" ]; then
diff -r 02b7285c078f -r b5541f296b92 scripts/build/libc/glibc-eglibc.sh-common
--- a/scripts/build/libc/glibc-eglibc.sh-common	Thu Jun 02 22:30:55 2011 +0200
+++ b/scripts/build/libc/glibc-eglibc.sh-common	Fri Jun 03 17:21:56 2011 +0200
@@ -240,8 +240,8 @@
     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}")
+        extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     fi
 
     extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}"
diff -r 02b7285c078f -r b5541f296b92 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Thu Jun 02 22:30:55 2011 +0200
+++ b/scripts/crosstool-NG.sh.in	Fri Jun 03 17:21:56 2011 +0200
@@ -153,6 +153,9 @@
 CT_CC_CORE_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_CORE_EXTRA_CONFIG} "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" )
 CT_CC_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_EXTRA_CONFIG} "${CT_CC_EXTRA_CONFIG_ARRAY[@]}" )
 
+# Compute the package version string
+CT_PKGVERSION="crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}"
+
 # Compute the working directories names
 CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"
 CT_SRC_DIR="${CT_WORK_DIR}/src"