pkgconf: don't double prefix lib/include paths with sysroot
authorThomas De Schampheleire <patrickdepinguin@gmail.com>
Sat, 21 Jun 2014 15:01:49 +0000 (17:01 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 29 Jun 2014 10:41:00 +0000 (12:41 +0200)
commit17eaa5d3ab1982a89c82e603484edbed8f712e16
treeffd69cffbff79e5d9d40d7adc96903feda53e702
parent9580c178e55b90c456096bb553f0cd0e26eff6a1
pkgconf: don't double prefix lib/include paths with sysroot

A .pc file could contain statements of the form:
    -L/usr/lib
but also:
    -L/path/to/sysroot/usr/lib

The latter form typically occurs when the dependency was configured with a
statement like --with-xxx=$(STAGING_DIR)/usr.

pkgconf only expects the first form, and prefixes it with the specified
sysroot. However, this strategy would result in a double sysroot in the
second case:
    -L/path/to/sysroot/path/to/sysroot/usr/lib

This patch checks for the presence of the sysroot in the specified -L or -I
directives, and only adds the sysroot when not already present.

Partially fixes bug #5750 (https://bugs.busybox.net/show_bug.cgi?id=5750)

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/pkgconf/pkgconf-02-fix-double-sysroot.patch [new file with mode: 0644]