1.1 --- a/config/toolchain.in Thu Jun 02 22:30:55 2011 +0200
1.2 +++ b/config/toolchain.in Fri Jun 03 17:21:56 2011 +0200
1.3 @@ -78,13 +78,18 @@
1.4 config TOOLCHAIN_PKGVERSION
1.5 string
1.6 prompt "Toolchain ID string"
1.7 - default "crosstool-NG-${CT_VERSION}"
1.8 + default ""
1.9 help
1.10 Specify a string that identifies your package. You may wish to include
1.11 a build number or build date. This version string will be included in
1.12 the output of gcc --version, and also in binutils, eglibc, gdb and
1.13 gdbserver.
1.14
1.15 + If this string is left empty, the actual package version will be:
1.16 + "crosstool-NG ${CT_VERSION}"
1.17 + Otherwise, it will be:
1.18 + "crosstool-NG ${CT_VERSION} - ${CT_TOOLCHAIN_PKGVERSION}"
1.19 +
1.20 This is passed to the configure flag --with-pkgversion.
1.21
1.22 config TOOLCHAIN_BUGURL
2.1 --- a/scripts/build/binutils/binutils.sh Thu Jun 02 22:30:55 2011 +0200
2.2 +++ b/scripts/build/binutils/binutils.sh Fri Jun 03 17:21:56 2011 +0200
2.3 @@ -56,8 +56,8 @@
2.4 extra_config+=( --enable-plugins )
2.5 fi
2.6 if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
2.7 - [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
2.8 - [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
2.9 + extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
2.10 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
2.11 fi
2.12
2.13 CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
2.14 @@ -147,8 +147,8 @@
2.15 CT_DoLog EXTRA "Configuring binutils for target"
2.16
2.17 if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
2.18 - [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
2.19 - [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
2.20 + extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
2.21 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
2.22 fi
2.23
2.24 CT_DoExecLog CFG \
3.1 --- a/scripts/build/cc/gcc.sh Thu Jun 02 22:30:55 2011 +0200
3.2 +++ b/scripts/build/cc/gcc.sh Fri Jun 03 17:21:56 2011 +0200
3.3 @@ -161,8 +161,8 @@
3.4
3.5 if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
3.6 # Bare metal delivers the core compiler as final compiler, so add version info and bugurl
3.7 - [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
3.8 - [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
3.9 + extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
3.10 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
3.11 fi
3.12
3.13 if [ "${copy_headers}" = "y" ]; then
3.14 @@ -405,8 +405,8 @@
3.15
3.16 [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
3.17 if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
3.18 - [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
3.19 - [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
3.20 + extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
3.21 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
3.22 fi
3.23 case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in
3.24 y) extra_config+=("--enable-sjlj-exceptions");;
4.1 --- a/scripts/build/debug/300-gdb.sh Thu Jun 02 22:30:55 2011 +0200
4.2 +++ b/scripts/build/debug/300-gdb.sh Fri Jun 03 17:21:56 2011 +0200
4.3 @@ -99,8 +99,8 @@
4.4 esac
4.5
4.6 if [ "${CT_GDB_HAS_PKGVERSION_BUGURL}" = "y" ]; then
4.7 - [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
4.8 - [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
4.9 + extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
4.10 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
4.11 fi
4.12
4.13 if [ "${CT_GDB_CROSS}" = "y" ]; then
5.1 --- a/scripts/build/libc/glibc-eglibc.sh-common Thu Jun 02 22:30:55 2011 +0200
5.2 +++ b/scripts/build/libc/glibc-eglibc.sh-common Fri Jun 03 17:21:56 2011 +0200
5.3 @@ -240,8 +240,8 @@
5.4 esac
5.5
5.6 if [ "${CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
5.7 - [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
5.8 - [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
5.9 + extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
5.10 + [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
5.11 fi
5.12
5.13 extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}"
6.1 --- a/scripts/crosstool-NG.sh.in Thu Jun 02 22:30:55 2011 +0200
6.2 +++ b/scripts/crosstool-NG.sh.in Fri Jun 03 17:21:56 2011 +0200
6.3 @@ -153,6 +153,9 @@
6.4 CT_CC_CORE_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_CORE_EXTRA_CONFIG} "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" )
6.5 CT_CC_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_EXTRA_CONFIG} "${CT_CC_EXTRA_CONFIG_ARRAY[@]}" )
6.6
6.7 +# Compute the package version string
6.8 +CT_PKGVERSION="crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}"
6.9 +
6.10 # Compute the working directories names
6.11 CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"
6.12 CT_SRC_DIR="${CT_WORK_DIR}/src"