This is the mail archive of the crossgcc@sourceware.org mailing list for the crossgcc project.
See the CrossGCC FAQ for lots more information.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Hi Benoit, 2011/6/1 Benoît THÉBAUDEAU <benoit.thebaudeau@advansee.com>: > # HG changeset patch > # User "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> > # Date 1306960344 -7200 > # Node ID b96b4403c850000dfe69b7d64bc4d65542007290 > # Parent ?9e3cbe13deae566d9ec0c31f38afe238f7c9660d > kconfig: prepend CT-NG's version tag to PKGVERSION > could you please avoid to prefix your patches with `kconfig' when they truly applied to the `config'. Each time I see a patch prefixed with `kconfig', I think there is something wrong with the tools, which picks up my attention as per the not-fully standard way crosstool-ng uses it. Thanks in advance, - Arnaud > "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 --git a/config/toolchain.in b/config/toolchain.in > --- a/config/toolchain.in > +++ b/config/toolchain.in > @@ -69,13 +69,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 --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh > --- a/scripts/build/binutils/binutils.sh > +++ b/scripts/build/binutils/binutils.sh > @@ -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=crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_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=crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}") > + ? ? ? ? ? ?[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") > ? ? ? ? fi > > ? ? ? ? CT_DoExecLog CFG ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ > diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh > --- a/scripts/build/cc/gcc.sh > +++ b/scripts/build/cc/gcc.sh > @@ -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=crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_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=crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_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 --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh > --- a/scripts/build/debug/300-gdb.sh > +++ b/scripts/build/debug/300-gdb.sh > @@ -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=crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}") > + ? ? ? ?[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") > ? ? fi > > ? ? if [ "${CT_GDB_CROSS}" = "y" ]; then > diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common > --- a/scripts/build/libc/glibc-eglibc.sh-common > +++ b/scripts/build/libc/glibc-eglibc.sh-common > @@ -235,8 +235,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=crosstool-NG ${CT_VERSION}${CT_TOOLCHAIN_PKGVERSION:+ - ${CT_TOOLCHAIN_PKGVERSION}}") > + ? ? ? ?[ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") > ? ? fi > > ? ? extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" > -- For unsubscribe information see http://sourceware.org/lists.html#faq
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |