Commit Graph

11 Commits

Author SHA1 Message Date
Arnout Vandecappelle
7d69a79624 packages: use backtick instead of $(shell ...) make function
It is often difficult to know exactly when make will expand the
variable, and usually it can only be expanded after the dependencies
have been built (e.g. pkg-config or the .pc file). Using a backtick
instead makes it very clear that it will be expanded only while
executing the command.

This change is useful for two cases:

1. The per-package staging (and host) directory will be created as part
   of the configure step, so any $(shell ...) variable that is used in
   the configure step will fail because the directory doesn't exist
   yet.

2. 'make printvars' evaluates the variables it prints. It will therefore
   trigger a lot of errors from missing .pc files and others. The
   backticks, on the other hand, are not expanded, so with this change
   the output of 'make printvars' becomes clean again.

This commit contains only the easy changes: replace $(shell ...) with
`...`, and also replace ' with " where needed. Follow-up commits will
tackle the more complicated cases that need additional explanation.

After this change, the following instances of $(shell ...) will remain:

- All assignments that use :=
- All variables that are used in make conditionals (which don't expand
  the backticks).
- All variables that only refer to system executables and make
  variables that don't change.
- The calls to check-host-* in dependencies.mk, because it is eval'ed.

[Original patch by Fabio Porcedda, but extended quite a bit by Arnout.]

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-15 00:42:01 +02:00
Peter Korsgaard
1ae0e16afd neardal: properly quote output of pkg-config
Commit 5504039c4e (neardal: fix readline/libedit detection with static
linking) added the output of pkg-config to the LIBS shell variable without
adding quotes around it, breaking the logic if the output would ever consist
of more than 1 word.

Now, pkg-config --libs ncurses currently only outputs '-lncurses', so
nothing is really broken (for now atleast), but lets add the quotes before
it does or the syntax gets copied somewhere else where it does.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-22 00:04:32 +02:00
Peter Korsgaard
5504039c4e neardal: fix readline/libedit detection with static linking
Fixes:
http://autobuild.buildroot.net/results/c3e/c3ea67d9b341749b9591451da3f3b0cb4a9fbb74/
http://autobuild.buildroot.net/results/586/586fa95149aa37df7ef430e3a47a3418e6f7ed97/
http://autobuild.buildroot.net/results/3ea/3eabd3a2cea0d5863b1c0dd8f55c73f34a684f79/

Both readline and libedit link with ncurses but the configure script forgets
to take that into account, causing the detection to fail when linking
statically.

Fix it by using pkg-config to add the needed linker options for ncurses.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-16 23:00:47 +02:00
Jerzy Grzegorek
bd8c733fb4 packages: indentation cleanup
This commit doesn't touch infra packages.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-31 13:57:41 +02:00
Maxime Hadjinlian
7cd6782ad7 neardal: bump version
[Thomas: add dependency on either readline or libedit, which is needed
for new versions of neardal.]

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-02-01 22:19:28 +01:00
Simon Dawson
3b19406686 neardal: bump to recent git snapshot
Also remove a local patch which has now been accepted upstream.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-16 12:19:58 +01:00
Mischa Jonker
e5c392830e packages: convert Github http:// users to the github helper
[Thomas: taken from Mischa original github patch.]

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-06 22:38:26 +01:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Simon Dawson
cfe3f67df3 neardal: add support for ncl tool
[Peter: move directly under neardal option so it gets indented]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-26 12:39:18 +02:00
Simon Dawson
caf19397fb neardal: bump version to 0.8
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-21 23:15:16 +01:00
Simon Dawson
907ff8983e neardal: new package
[Peter: add toolchain deps for dbus. add dbus/host-pkgconf, wrap help text]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  (built-test on a minimal powerpc config)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-05 11:22:48 -08:00