Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2 of 3 v3] qt5: support buildroot being located in /usr
Date: Sat, 21 Jun 2014 17:01:48 +0200	[thread overview]
Message-ID: <b3e4c074d9f7aee6e841.1403362908@localhost> (raw)
In-Reply-To: <patchbomb.1403362906@localhost>

qt5 performs sed replacements of /usr to $(STAGING_DIR)/usr in .la files.
However, if buildroot itself is located in /usr, then STAGING_DIR also
starts with /usr, and naive replacements of '/usr' can result in paths of
the form:
    /usr/buildroot/.../sysroot/usr/buildroot/.../sysroot/...

This patch makes the replacements more careful, by first replacing the known
paths BASE_DIR and STAGING_DIR to tokens, then performing the actual
replacement, and finally replacing the tokens with the corresponding paths.

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

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
v3: remove redundent replacement s/$(STAGING_DIR)/@STAGING_DIR@/ (Arnout)
v2: no changes

 package/qt5/qt5.mk |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff -r f9dbe1c9d761 -r b3e4c074d9f7 package/qt5/qt5.mk
--- a/package/qt5/qt5.mk	Sat Jun 21 11:08:31 2014 +0200
+++ b/package/qt5/qt5.mk	Thu Jun 19 21:16:12 2014 +0200
@@ -5,7 +5,11 @@
 
 define QT5_LA_PRL_FILES_FIXUP
 	for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \
-		$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$i; \
+		$(SED)  "s:$(BASE_DIR):@BASE_DIR@:g" \
+			-e "s:\(['= ]\)/usr:\\1 at STAGING_DIR@/usr:g" \
+			-e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
+			-e "s:@BASE_DIR@:$(BASE_DIR):g" \
+			$$i ; \
 		$(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \
 	done
 	for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \

  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 ` Thomas De Schampheleire [this message]
2014-06-29 10:40   ` [Buildroot] [PATCH 2 of 3 v3] qt5: " Thomas Petazzoni
2014-06-21 15:01 ` [Buildroot] [PATCH 3 of 3 v3] pkgconf: don't double prefix lib/include paths with sysroot Thomas De Schampheleire
2014-06-29 10:41   ` 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=b3e4c074d9f7aee6e841.1403362908@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox