1 pkgconf: don't double prefix lib/include paths with sysroot
3 A .pc file could contain statements of the form:
6 -L/path/to/sysroot/usr/lib
8 The latter form typically occurs when the dependency was configured with a
9 statement like --with-xxx=$(STAGING_DIR)/usr.
11 pkgconf only expects the first form, and prefixes it with the specified
12 sysroot. However, this strategy would result in a double sysroot in the
14 -L/path/to/sysroot/path/to/sysroot/usr/lib
16 This patch checks for the presence of the sysroot in the specified -L or -I
17 directives, and only adds the sysroot when not already present.
19 Upstream-status: will be submitted
21 Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
25 1 files changed, 2 insertions(+), 1 deletions(-)
28 diff -r 16865d81819f -r 9d8e1737687f main.c
29 --- a/main.c Mon Jun 16 19:47:52 2014 +0200
30 +++ b/main.c Mon Jun 16 19:48:15 2014 +0200
36 + if (strncmp(sysroot_dir, frag->data, strlen(sysroot_dir)) != 0)