qt5: support buildroot being located in /usr
authorThomas De Schampheleire <patrickdepinguin@gmail.com>
Sat, 21 Jun 2014 15:01:48 +0000 (17:01 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 29 Jun 2014 10:39:57 +0000 (12:39 +0200)
commit9580c178e55b90c456096bb553f0cd0e26eff6a1
tree7bbfa02b68a0331773e7f5f600911d8ccd24e7ea
parent7701fc53d19be7cab8bddba72046a39e8421fd9e
qt5: support buildroot being located in /usr

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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/qt5/qt5.mk