Commit Graph

74 Commits (2acab2f06197ab34243fc415020ead54d4a9e505)

Author SHA1 Message Date
Alexey Neyman 204fef03f6 Doh. Change the name of the substituted variable
... to match the substituted name.

Fixes #966.

Signed-off-by: Alexey Neyman <stilor@att.net>
5 years ago
Alexey Neyman 4e7d0906c1 Support out-of-tree local builds
Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 355f6f03fb Cannot ignore 'make install' with automake
Automake does not allow us to place the hooks before its generated actions,
and does not allow us to check MAKECMDGOALS, and does not support a mechanism
for disabling make install (such as noinst_SUBDIRS, requested a few times
on automake mailing list). The only way I could preserve the current behavior
is to have a GNUmakefile wrapper that will convert MAKECMDGOAL into a variable
unknown to automake - which seems too convoluted a solution for the problem
being solved.

Hence the approach is to not override anything for --enable-local. It is now
fully handled by selecting different values for CT_xxx_DIR in ct-ng.in; but
at the build-system level, all the variables remain the same. We just don't
support 'make install' in that case anymore; but the ct-ng in the working
copy can be used after a regular 'make' (or 'make all').

Help message for --enable-local updated accordingly.

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman f45e29c5ca Restore --enable-local use
Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 5159cd7bc0 Adjust the paths to match new stuff location
Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 5b95b81ea9 Kill gperf vestiges
Generate paths.sh by configure, do away with paths.mk.

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 0dc8565c4f Merge steps.mk into ct-ng
Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 69df9ae9dd Remove the need for configure substitutions in scripts
... so that scripts/ directory can be installed verbatim.

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman dbe3877285 Install ct-ng
Also, move kconfig.mk into the main driver - we'd want kconfig to be a sub-package
so there's no sense in writing the installation framework for the ct-ng-specific
fragment in an otherwise independent directory.

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman d401afbdda Get rid of sub{lib,doc}dir
They don't make sense - using same ct-ng won't work with different versions,
so they cannot coexist in the same prefix.

Also localize other configure variables so that their usage is easier to track.

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman d759137c46 Align script names with the ct-ng commands
Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 0346153bdb Save export status for environment vars
... and limit our modifications to our variables.

Fixes #762.

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman 1b4e784a0b Fix debuild warnings/errors
- Update .gitignore, do not place .gitignore into directories installed
in bulk
- Remove executable permissions and shebangs from the scripts that are
supposed to be invoked only via ct-ng frontent; prepend them with $(bash).
Despite what showSamples.sh said, it already has some bashisms.
- Remove --with autotools-dev and override dh_update_autotools_config
to avoid having config.{sub,guess} clobbered with older versions
- Install bash completion where Debian (now) expects it
- Update man page to use .\" as the comment delimiter, instead of
undefined macro (."); also, minor text edits.
- Install kconfig.mk without execute permission.
- Remove shell wrappers from 170-localedef-fix-trampoline.patch, we
do not use that for applying patches
- Revoke execute permissions on 210-expat.sh
- Get flags from dpkg-buildflags if available

Signed-off-by: Alexey Neyman <stilor@att.net>
6 years ago
Alexey Neyman c9dad33728 Use config from the install location
... no need to create a local symlink.

Signed-off-by: Alexey Neyman <stilor@att.net>
7 years ago
Alexey Neyman 35f89c4064 Detect both wget/curl and allow user to select the agent
Signed-off-by: Alexey Neyman <stilor@att.net>
7 years ago
Alexey Neyman 955f5bc0b8 Get rid of .config.2.
Now handled by CT_LoadConfig.

Signed-off-by: Alexey Neyman <stilor@att.net>
7 years ago
Alexey Neyman c0cc73cd6f Install canadian crosses into a separate subdir.
Makes them sorted out by host, and removes the need for similar hack in
samples.mk.

Change how canadian crosses are named: using `=' character resulted in
Glibc build failure.

Move loading config into a common function, CT_LoadConfig.

Signed-off-by: Alexey Neyman <stilor@att.net>
7 years ago
Alexey Neyman dcb438a9dc Fix ct-ng show-config.
If configured with --enable-local, CT_NG is exported as plain 'ct-ng'
without any path. showSamples.sh then fails to invoke ct-ng (as current
directory is not in $PATH).

Signed-off-by: Alexey Neyman <stilor@att.net>
7 years ago
Bryan Hundven 85f98147f5 Merge pull request #233 from stilor/fix-build-all
Fix build-all
8 years ago
Alexey Neyman 5844514e74 Fix samples using GMP 4.3.2.
Some older versions of configure (including the one in GMP 4.3.2)
interpret the $ECHO environment variable as the `echo' utility to
use. CT-NG sets the variable to `:' and exports it if V=0 or V=1
is supplied, breaking the samples using such configure. This currently
includes bfin-unknown-linux-uclibc and powerpc-unknown-linux-uclibc.

Also, correct the description of the V= variable - V=0 is *not* the
default; in fact, default does not correspond to any of the V=[012]
values.

Signed-off-by: Alexey Neyman <stilor@att.net>
8 years ago
Alexey Neyman 1ad356c178 Clean up new .build-all directory.
Signed-off-by: Alexey Neyman <stilor@att.net>
8 years ago
Alexey Neyman 263e8026ec Change sed monstrosity into a make variable.
The convoluted sed expression was doing what is already available in
make as `$*'.

Signed-off-by: Alexey Neyman <stilor@att.net>
8 years ago
Alexey Neyman 319023c7af Implement 'ct-ng source'.
Provides a simpler alternative to editing config to enable
CT_ONLY_DOWNLOAD, doing ct-ng build and then restoring .config.

Signed-off-by: Alexey Neyman <stilor@att.net>
8 years ago
Yann E. MORIN 643d93e0dc all: remove references to creating a tarball
This has been broken for ages, time to finaly remove it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
9 years ago
Yann E. MORIN e20dcac9dd ct-ng: 'clean' removes the build dir
It makes more sense to remove the build dir on 'clean' rather than
on 'distclean', since the latter also trashes the .config file.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
9 years ago
Yann E. MORIN" ffee93e4d2 docs: update my e-mail
Since anciens.enib.fr has been dead for two months now, without any
hope of recovery, update my e-mail to point to @free.fr instead.

Reported-by: "Bryan Hundven" <bryanhundven@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
12 years ago
Johannes Stezenbach 10177ac2c2 help: fix typo
Signed-off-by: Johannes Stezenbach <js@sig21.net>
12 years ago
Yann E. MORIN" f2f6d799c5 configure: handle --program-prefix
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
12 years ago
Yann E. MORIN" 2c3b6d2b71 scripts: munge .config to handle array variables
Transfrom array variables from pure strings (in the kconfig output)
into proper bash arrays declarations, for feeding to the build scripts.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
13 years ago
Yann E. MORIN" 7bfa4139ad scripts: leave changelog in build dir, copy to install dir
Users tend to look for the build log in the current working directory,
rather than in the toolchain's installation dir. While bundling the build
log in the toolchain installation dir is nice for distribution and review,
it can be easier to have the build log readily available in the working
directory, as it is quicker to get to it.

So, the build log stays in the working directory until the toolchain is
completely and successfully built, and then a (compressed) copy is made.

Reported-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
13 years ago
Yann E. MORIN" bd8723cd92 scripts: fix distclean
Do not fail in case either one or both of target/ and
.build/ directories are missing.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
13 years ago
Yann E. MORIN" 077e46ff10 scripts: update distclean
The toolchains are now built in .build/ rather than in targets/
so distclean has to get rid of that.

We also clean up the old dir, as users may have old samples that
still refer to the old location.

Do not hide messages during distclean, and do not ignore errors.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
13 years ago
Yann E. MORIN" a211f4100d docs: split into multiple files
The overview.txt file has evolved into more than just an overview.
Split it into chapters, and include the misc tutorials.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
13 years ago
Yann E. MORIN" e5a007415a scripts: misc help and auto-complete fixes
- don't list samples in the main help screen
- improve the samples listing in list-samples
- don't document the 'config' action, it's long dead
- document the 'V' environment variable
- improve on START, STOP and PREFIX environment variables
- add PREFIX and V to autocomplete
- advertise auto-complete at install time
14 years ago
Yann E. MORIN" d691923e88 config: fix generated config files when GREP_OPTIONS set --color=always
grep is used when generating some .in files (in config.gen). If GREP_OPTIONS
contains --color=always, then the generated files will contains some escape
sequences setting the color, and mconf would choke on those escape sequences.

Always set and export an empty GREP_OPTIONS to avoid that.

Issue reported by Kevin Kirkup <kevin dot kirkup at gmail dot com> :
  http://sourceware.org/ml/crossgcc/2009-12/msg00026.html
14 years ago
Yann E. MORIN" 01240b9fbf scripts: fix updating config.{sub,guess} 14 years ago
Yann E. MORIN" e89072b5a5 Add a new action: show-tuple
- in a directory containing a crosstool-NG configuration,
  prints the tuple of the configured target to stdout.

 -------- diffstat follows --------
 /trunk/Makefile.in             |    4     3     1     0 +++-
 /trunk/scripts/showTuple.sh.in |   30    30     0     0 ++++++++++++++++++++++++++++++
 /trunk/ct-ng.comp              |    2     1     1     0 +-
 /trunk/ct-ng.in                |   10     9     1     0 +++++++++-
 4 files changed, 43 insertions(+), 3 deletions(-)
15 years ago
Yann E. MORIN" c7a1e6a4da Use the paths found by ./configure in the ct-ng.in makefile script and its fragments.
/trunk/kconfig/kconfig.mk |    2     1     1     0 +-
 /trunk/samples/samples.mk |   18     9     9     0 +++++++++---------
 /trunk/config/config.mk   |   10     5     5     0 +++++-----
 /trunk/ct-ng.in           |   22    13     9     0 +++++++++++++---------
 4 files changed, 28 insertions(+), 24 deletions(-)
15 years ago
Yann E. MORIN" f6a8ed369f Small semantic fix in ct.ng(.in): use make builtin variable to know the make-script name.
/trunk/ct-ng.in |   10     6     4     0 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
15 years ago
Yann E. MORIN" 420f3fdd25 Rename scripts/crosstool.sh to scripts/crosstool-NG.sh.
After all, this is not crosstool, but really crosstool-NG!

 /trunk/steps.mk |    2     1     1     0 +-
 /trunk/ct-ng.in |    2     1     1     0 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
15 years ago
Yann E. MORIN" eca38a0246 Use ./configure-discovered paths in Makefile.
/trunk/Makefile.in |   55    31    24     0 +++++++++++++++++++++++++++++++------------------------
 /trunk/ct-ng.in    |    2     1     1     0 +-
 2 files changed, 32 insertions(+), 25 deletions(-)
15 years ago
Yann E. MORIN" 65bb3ac67c Get rid of the tols/ directory:
- move config.guess and config.sub from tools/ into scripts/
- update the scripts and makefile fragments accordingly

 /trunk/Makefile.in        |   10     5     5     0 +++++-----
 /trunk/scripts/functions  |   16     8     8     0 ++++++++--------
 /trunk/scripts/scripts.mk |   28    13    15     0 +++++++++++++---------------
 /trunk/ct-ng.in           |    4     2     2     0 ++--
 4 files changed, 28 insertions(+), 30 deletions(-)
15 years ago
Yann E. MORIN" eb0d243d03 Update help (mostly eye-candy).
/trunk/ct-ng.in |    4     2     2     0 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
15 years ago
Yann E. MORIN" 2730c0b494 Move steps-related help into steps.mk.
/trunk/steps.mk |    4     4     0     0 ++++
 /trunk/ct-ng.in |    2     0     2     0 --
 2 files changed, 4 insertions(+), 2 deletions(-)
15 years ago
Yann E. MORIN" 993eeb9f8f Use $(MAKE) for recursive calls, don't directly use $(CT_NG).
Pass on the V variable on the $(MAKE) command lines.

 /trunk/steps.mk |    6     3     3     0 +++---
 /trunk/ct-ng.in |    2     1     1     0 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
15 years ago
Yann E. MORIN" ca905573f3 Also export the V value to sub-makes.
/trunk/ct-ng.in |    2     1     1     0 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
15 years ago
Yann E. MORIN" 5e5a5ef90b Correctly handle V= only from command line, not from environment.
/trunk/ct-ng.in |   17     8     9     0 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
15 years ago
Yann E. MORIN" c570927ef3 Eye-candy when {,dist}clean.
/trunk/tools/tools.mk |    1     1     0     0 +
 /trunk/ct-ng.in       |   16    12     4     0 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
15 years ago
Yann E. MORIN" 8d042db1d6 Extract the config files related stuff from the kconfig stuff
- create config/config.mk, with all the config.gen/ rules
- the only common points between config files and configurators:
  - the top-level config file to include, stored in KCONFIG_TOP
  - the config_file rules, which makes config files available to configurators
- dependency-files are renamed from %.d to %.dep (.d is reserved for directories)
- a few eye-candy here and there

 /trunk/kconfig/kconfig.mk |  184    12   172     0 +++--------------------------------------------------
 /trunk/config/config.mk   |  118     9   109     0 +++-------------------------------
 /trunk/ct-ng.in           |    1     1     0     0 +
 3 files changed, 22 insertions(+), 281 deletions(-)
15 years ago
Yann E. MORIN" f31bcd0026 Update the kconfig stuff to match the one in the linux-2.6.27 version.
/trunk/kconfig/zconf.hash.c         |  225   110   115     0 +++----
 /trunk/kconfig/lkc_proto.h          |    4     3     1     0 +
 /trunk/kconfig/mconf.c              |  217   110   107     0 +++---
 /trunk/kconfig/menu.c               |   86    60    26     0 ++-
 /trunk/kconfig/symbol.c             |  212   156    56     0 ++++--
 /trunk/kconfig/kconfig.mk           |   24     9    15     0 -
 /trunk/kconfig/lex.zconf.c          |   97    80    17     0 ++-
 /trunk/kconfig/util.c               |   38    30     8     0 +
 /trunk/kconfig/lkc.h                |   22    18     4     0 +
 /trunk/kconfig/expr.c               |   32    19    13     0 +
 /trunk/kconfig/confdata.c           |  254   172    82     0 +++++---
 /trunk/kconfig/lxdialog/dialog.h    |   12     9     3     0 +
 /trunk/kconfig/lxdialog/inputbox.c  |    6     3     3     0
 /trunk/kconfig/lxdialog/checklist.c |    4     2     2     0
 /trunk/kconfig/lxdialog/menubox.c   |    6     3     3     0
 /trunk/kconfig/lxdialog/textbox.c   |    2     1     1     0
 /trunk/kconfig/lxdialog/util.c      |   47    30    17     0 +
 /trunk/kconfig/lxdialog/yesno.c     |    4     2     2     0
 /trunk/kconfig/expr.h               |   20    10    10     0
 /trunk/kconfig/zconf.tab.c          | 1441   793   648     0 ++++++++++++++++++++++++-------------------
 /trunk/kconfig/conf.c               |  276   124   152     0 ++++----
 /trunk/kconfig/check-gettext.sh     |   14    14     0     0 +
 /trunk/ct-ng.in                     |    2     1     1     0
 23 files changed, 1759 insertions(+), 1286 deletions(-)
15 years ago