From e29fcde4ba70ce2259824b3b7dd807b2195baefa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 24 Aug 2023 23:08:00 +0200 Subject: [PATCH] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize qt6base installs things in /usr/mkspecs, but also the soon to be added qt6core5compat, and the existing package qwt as well. So let's move the removal of /usr/mkspecs in target-finalize, where we already remove lots of development-related directories, using a target-finalize hook in the qt6base package. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: make it a qt6base target-finalize hook] Signed-off-by: Yann E. MORIN --- package/qt6/qt6base/qt6base.mk | 5 +++++ package/qwt/qwt.mk | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c32089f551..67c705fb93 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -366,5 +366,10 @@ else QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF endif +define QT6BASE_RM_USR_MKSPECS + $(Q)rm -rf $(TARGET_DIR)/usr/mkspecs +endef +QT6BASE_TARGET_FINALIZE_HOOKS += QT6BASE_RM_USR_MKSPECS + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 9f0b78655f..f344ca4e3a 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -58,7 +58,6 @@ 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))