Makefile: remove $(TARGET_DIR)/usr/mkspecs in target-finalize
PATCH 1/1 Makefile: 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.
--- Makefile | 1 + package/qwt/qwt.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -0
@@ -747,6 +747,7 @@ endif rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc + rm -rf $(TARGET_DIR)/usr/mkspecs rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true ifneq ($(BR2_ENABLE_DEBUG):$(BR2_STRIP_strip),y:) rm -rf $(TARGET_DIR)/lib/debug $(TARGET_DIR)/usr/lib/debug
package/qwt/qwt.mk +0 -1
@@ -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))
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
On 2023-08-24 23:08 +0200, Thomas Petazzoni via buildroot spake thusly:
Quoted 16 lines
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/mkspecsin target-finalize, where we already remove lots of development-related directories.Signed-off-by Thomas Petazzoni <[email protected]>--- Makefile | 1 + package/qwt/qwt.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)Makefile +0
-0
Makefile endif · line 750
Quoted 4 lines
Makefile +1
-0@@ -747,6 +747,7 @@ endif rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc + rm -rf $(TARGET_DIR)/usr/mkspecs
Why don't you make that a QT6BASE_TARGET_FINALIZE_HOOKS ?
I'm warry of adding package-specific cleanup in the generic code, and we introduced FOO_TARGET_FINALIZE_HOOKS specifically for such use-cases.
Regards,
Yann E. MORIN.
Quoted 22 lines
Makefile +0
-0rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true ifneq ($(BR2_ENABLE_DEBUG):$(BR2_STRIP_strip),y:) rm -rf $(TARGET_DIR)/lib/debug $(TARGET_DIR)/usr/lib/debugpackage/qwt/qwt.mk +0
-1@@ -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))Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedThomas, All,
On 2023-08-24 23:08 +0200, Thomas Petazzoni via buildroot spake thusly:
Quoted 16 lines
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/mkspecsin target-finalize, where we already remove lots of development-related directories.Signed-off-by Thomas Petazzoni <[email protected]>--- Makefile | 1 + package/qwt/qwt.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)Makefile +0
-0
Makefile endif · line 750
Quoted 4 lines
Makefile +1
-0@@ -747,6 +747,7 @@ endif rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc + rm -rf $(TARGET_DIR)/usr/mkspecs
As I suggested back in August, without negative feedback, I made that a target-finalize hook of the qt6base package.
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 22 lines
Makefile +0
-0rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true ifneq ($(BR2_ENABLE_DEBUG):$(BR2_STRIP_strip),y:) rm -rf $(TARGET_DIR)/lib/debug $(TARGET_DIR)/usr/lib/debugpackage/qwt/qwt.mk +0
-1@@ -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))Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot