From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3 of 3 v3] pkgconf: don't double prefix lib/include paths with sysroot
Date: Sat, 21 Jun 2014 17:01:49 +0200 [thread overview]
Message-ID: <5aefddc71a6fc227c718.1403362909@localhost> (raw)
In-Reply-To: <patchbomb.1403362906@localhost>
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>
---
v3: no changes
v2: no changes
package/pkgconf/pkgconf-02-fix-double-sysroot.patch | 40 +++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff -r b3e4c074d9f7 -r 5aefddc71a6f package/pkgconf/pkgconf-02-fix-double-sysroot.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package/pkgconf/pkgconf-02-fix-double-sysroot.patch Thu Jun 19 21:16:17 2014 +0200
@@ -0,0 +1,40 @@
+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.
+
+Upstream-status: will be submitted
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+
+---
+ main.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+
+diff -r 16865d81819f -r 9d8e1737687f main.c
+--- a/main.c Mon Jun 16 19:47:52 2014 +0200
++++ b/main.c Mon Jun 16 19:48:15 2014 +0200
+@@ -82,7 +82,8 @@
+ {
+ case 'L':
+ case 'I':
+- return sysroot_dir;
++ if (strncmp(sysroot_dir, frag->data, strlen(sysroot_dir)) != 0)
++ return sysroot_dir;
+ default:
+ break;
+ }
next prev parent reply other threads:[~2014-06-21 15:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-21 15:01 [Buildroot] [PATCH 0 of 3 v3] Support buildroot being located in /usr Thomas De Schampheleire
2014-06-21 15:01 ` [Buildroot] [PATCH 1 of 3 v3] infra: support " Thomas De Schampheleire
2014-06-25 21:26 ` Arnout Vandecappelle
2014-06-29 10:39 ` Thomas Petazzoni
2014-06-29 11:07 ` Thomas De Schampheleire
2014-06-29 11:22 ` Thomas Petazzoni
2014-06-29 11:44 ` Thomas De Schampheleire
2014-06-21 15:01 ` [Buildroot] [PATCH 2 of 3 v3] qt5: " Thomas De Schampheleire
2014-06-29 10:40 ` Thomas Petazzoni
2014-06-21 15:01 ` Thomas De Schampheleire [this message]
2014-06-29 10:41 ` [Buildroot] [PATCH 3 of 3 v3] pkgconf: don't double prefix lib/include paths with sysroot Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5aefddc71a6fc227c718.1403362909@localhost \
--to=patrickdepinguin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.