Commit Graph

3 Commits

Author SHA1 Message Date
Michael J. Hammel
5496bc399b pkg-config: Add "mapdir" to sysroot handled variables
Closes #3583, #3649

Fixes xfonts_font-adobe build failure.

Signed-off-by: Michael J. Hammel <mjhammel@graphics-muse.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-04 22:13:37 +02:00
Peter Korsgaard
117a8ea0ea pkg-config: only prepend sysroot to includedir / libdir
Only append sysroot to includedir / libdir, and not to other variables,
when a variable is requested (--variable=<name>), similar to how it
is done for the -I / -L flags in cflags/ldflags.

The problem is that pkg-config doesn't have any explicit cross compilation
support, so there's some confusion about what are host paths and what are
target ones.  Includedir / libdir are paths for the (cross) compiler, so
those should normally have sysroot prepended, but other variables might
refer to target paths instead.

This fixes the installation of the xfonts-* packages, which uses
pkg-config --variable=fontrootdir fontutil to figure out the target
installation location for fonts.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-10 11:36:18 +01:00
Peter Korsgaard
b4df2ea27f pkg-config: prefix sysroot to path variables
Fixes gst-plugins-bad build, if gstreamer is installed on host with xml
support, as it uses pkg-config --variable=includedir to find gstconfig.h,
and hence ends up looking at the host version.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-29 23:03:16 +01:00