diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-07-03 21:58:43 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-07-04 15:49:59 +0200 |
| commit | 6f638ea9c9c7bacc646430a74ad3dd2740eae676 (patch) | |
| tree | 51ca198975beb807120768e7f17755a89035ef68 /package/qt5 | |
| parent | 065c7fcd7a16b4e4c908c975112dc3fb1265c415 (diff) | |
| download | buildroot-6f638ea9c9c7bacc646430a74ad3dd2740eae676.tar.gz buildroot-6f638ea9c9c7bacc646430a74ad3dd2740eae676.zip | |
infra: /usr support: STAGING_DIR can be outside BASE_DIR
If the user sets a custom BR2_HOST_DIR, then STAGING_DIR is not under
BASE_DIR. The .pc/.la file fixup commands incorrectly made this assumption
and thus should be corrected.
Additionally, this patch:
- rewords the comment in pkg-autotools that explains the replacements.
- removes a for statement in favor of xargs
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/qt5.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 5f90eb5cc0..a88b593fd7 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,6 +6,7 @@ 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:$(BASE_DIR):@BASE_DIR@:g" \ + -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \ -e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \ -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \ -e "s:@BASE_DIR@:$(BASE_DIR):g" \ |
