From 7fe4e29b5ea2c129c123df2d847fc8e04f06e93e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 10 Jan 2024 21:13:43 +0100 Subject: [PATCH] package/qwt: reinstate mkspecs cleanup The qwt package is a Qt5 package, not a Qt6 one, so it can't benefit from the target-finalize hook that was introduced in e29fcde4ba70 (package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize). Indeed, the original patch was hard-coding the mkspecs removal directly in the target-finalize recipe, and that was made a hook as a last-minute change when applying, without realising that qwt was qt5-based. So, reinstate the mkspecs removal as an ad-hoc fixup in the qwt package. This actually partially reverts commit e29fcde4ba70 (package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/qwt/qwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index f344ca4e3a..9f0b78655f 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -58,6 +58,7 @@ endef define QWT_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) + rm -Rf $(TARGET_DIR)/usr/mkspecs endef $(eval $(qmake-package))