ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-06 19:09:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kconfig: prepend CT-NG's version tag to PKGVERSION

Browse Source 
"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>
This commit is contained in:
Benoît THÉBAUDEAU" 2011-06-03 17:21:56 +02:00
parent 7f504c6c27
commit d147fbb201
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/toolchain.in
View File

@ -78,13 +78,18 @@ config STATIC_TOOLCHAIN
config TOOLCHAIN_PKGVERSION config TOOLCHAIN_PKGVERSION
string string
prompt "Toolchain ID string" prompt "Toolchain ID string"
default "crosstool-NG-${CT_VERSION}" default ""
help help
Specify a string that identifies your package. You may wish to include 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 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 the output of gcc --version, and also in binutils, eglibc, gdb and
gdbserver. 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. This is passed to the configure flag --with-pkgversion.
config TOOLCHAIN_BUGURL config TOOLCHAIN_BUGURL

8
scripts/build/binutils/binutils.sh
View File

@ -56,8 +56,8 @@ do_binutils() {
extra_config+=( --enable-plugins ) extra_config+=( --enable-plugins )
fi fi
if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
[ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi fi
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
@ -147,8 +147,8 @@ do_binutils_target() {
CT_DoLog EXTRA "Configuring binutils for target" CT_DoLog EXTRA "Configuring binutils for target"
if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
[ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi fi
CT_DoExecLog CFG \ CT_DoExecLog CFG \

8
scripts/build/cc/gcc.sh
View File

@ -161,8 +161,8 @@ do_cc_core() {
if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
# Bare metal delivers the core compiler as final compiler, so add version info and bugurl # 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}") extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi fi
if [ "${copy_headers}" = "y" ]; then if [ "${copy_headers}" = "y" ]; then
@ -405,8 +405,8 @@ do_cc() {
[ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared") [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then if [ "${CT_CC_GCC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
[ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi fi
case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in
y) extra_config+=("--enable-sjlj-exceptions");; y) extra_config+=("--enable-sjlj-exceptions");;

4
scripts/build/debug/300-gdb.sh
View File

@ -99,8 +99,8 @@ do_debug_gdb_build() {
esac esac
if [ "${CT_GDB_HAS_PKGVERSION_BUGURL}" = "y" ]; then if [ "${CT_GDB_HAS_PKGVERSION_BUGURL}" = "y" ]; then
[ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi fi
if [ "${CT_GDB_CROSS}" = "y" ]; then if [ "${CT_GDB_CROSS}" = "y" ]; then

4
scripts/build/libc/glibc-eglibc.sh-common
View File

@ -240,8 +240,8 @@ do_libc() {
esac esac
if [ "${CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL}" = "y" ]; then if [ "${CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL}" = "y" ]; then
[ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}") extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
fi fi
extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}"

3
scripts/crosstool-NG.sh.in
View File

@ -153,6 +153,9 @@ CT_TARGET_LDFLAGS="${CT_ARCH_TARGET_LDFLAGS} ${CT_TARGET_LDFLAGS}"
CT_CC_CORE_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_CORE_EXTRA_CONFIG} "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" ) 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[@]}" ) 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 # Compute the working directories names
CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs" CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"
CT_SRC_DIR="${CT_WORK_DIR}/src" CT_SRC_DIR="${CT_WORK_DIR}/src"