| Message ID | 6e3c4b7bdba8afe3d9d50b2e6af7144f9606a6e0.1338653505.git.thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 755a51f327d7d18f31e6b352cdd7032d2d01e35f |
| Headers | show |
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs,
Thomas> but also libraries that which to integrate with qmake, such as
s/which/wish/
Thomas> qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs,
Thomas> so the easiest solution is to have a symbolic between the two
s/symbolic/symbolic link/
Committed with these fixes, thanks.
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 7e6c5dd..b751696 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -583,8 +583,7 @@ define QT_INSTALL_STAGING_CMDS $(MAKE) -C $(@D) install mkdir -p $(HOST_DIR)/usr/bin mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin - rm -rf $(HOST_DIR)/usr/mkspecs - mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr + ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs $(QT_INSTALL_QT_CONF) endef
In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs, but also libraries that which to integrate with qmake, such as qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs, so the easiest solution is to have a symbolic between the two directories, instead of copying things around. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/qt/qt.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)