diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-06-21 17:01:48 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-06-29 12:39:57 +0200 |
| commit | 9580c178e55b90c456096bb553f0cd0e26eff6a1 (patch) | |
| tree | 7bbfa02b68a0331773e7f5f600911d8ccd24e7ea /package/qt5 | |
| parent | 7701fc53d19be7cab8bddba72046a39e8421fd9e (diff) | |
| download | buildroot-9580c178e55b90c456096bb553f0cd0e26eff6a1.tar.gz buildroot-9580c178e55b90c456096bb553f0cd0e26eff6a1.zip | |
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>
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/qt5.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 44e5af02d8..5f90eb5cc0 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,7 +5,11 @@ include $(sort $(wildcard package/qt5/*/*.mk)) 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@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 \ |
