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>
In static linking scenarios, poppler doesn't find libtiff because it
doesn't use pkg-config, so it doesn't know which additional libraries
it should link with to test the availability of libtiff. We help
poppler in this work by passing a LIBTIFF_LIBS variable, resulting for
a pkg-config invocation.
Also, since poppler uses pkg-config, we make this dependency explicit
in this patch, even though it was already carried by the fontconfig
dependency.
Fixes:
http://autobuild.buildroot.org/results/be7/be78957dd852233c81bd364ddf664564ce8f0208/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit also adds an optional dependency on openjpeg: if
--enable-openjpeg=none is not passed, poppler assumes openjpeg is
available.
[Thomas:
- add optional dependency on openjpeg instead of mandatory
dependency.
- remove --enable-xpdf-headers, since there was no justification for
it.]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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>
Fixes CVE-2013-7296 - JBIG2Stream::readSegments()" Denial of Service
Vulnerability.
Also add hash file.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Install poppler's header files and libraries into staging, since it
provides a library that can be used by other packages.
[Thomas: slightly extended the commit message.]
Signed-off-by: Alan Ott <alan@signal11.us>
Suggested-by: Jeremie Scheer <jeremie.scheer@armadeus.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Add an option to build the libpoppler-qt4 library.
[Thomas: slightly adjust the Config.in file, by:
- Using an if BR2_PACKAGE_POPPLER ... endif block instead of a depends
on BR2_PACKAGE_POPPLER for the new option.
- Rewording the option prompt, since there's no need to indicate that
the Qt support is for poppler since we're already a sub-option of
poppler.]
Signed-off-by: Alan Ott <alan@signal11.us>
Suggested-by: Jeremie Scheer <jeremie.scheer@armadeus.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
merge
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Upgrade to latest stable release.
Release 0.24.4
core:
* Fix regression in broken endstream detection. Bug #70854
* Catalog: sort entries of NameTrees to make sure lookup works. Bug #26049
* Don't infinite loop if reading from GooFile::read fails. Bug #71835
utils:
* pdftotext: Do not close stdout. Bug #71639
* pdftotext: Silence warning for may be used uninitialized variable. Bug #71640
* pdftotext: Escape the text of the xml headers
* Warn the user if he provides a wrong range
qt4:
* Fix typo in xml API. Bug #71643
qt5:
* Fix typo in xml API. Bug #71643
Release 0.24.3
core:
* PSOutputDev: Fix PFB font embedding. Bug #69717
* CairoOutputDev: Do not set an invalid matrix in drawImage(). Bug #70085
qt4:
* Don't crash if getXRef()->copy() fails
qt5:
* Don't crash if getXRef()->copy() fails
utils:
* pdfseparate: Allow only one %d in the filename. Bug #69434
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
[Peter: Fix license, comment text and drop explicit library options]
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>