[Buildroot] [git commit] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize

[Buildroot] [git commit] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize

[Yann E. MORIN]

commit: https://git.buildroot.net/buildroot/commit/?id=e29fcde4ba70ce2259824b3b7dd807b2195baefa
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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 <thomas.petazzoni@bootlin.com>
[yann.morin.1998@free.fr: make it a qt6base target-finalize hook]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 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))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [git commit] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=e29fcde4ba70ce2259824b3b7dd807b2195baefa
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > 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 <thomas.petazzoni@bootlin.com>
 > [yann.morin.1998@free.fr: make it a qt6base target-finalize hook]
 > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
 > ---
 >  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

Hmm, qwt is a qt5 package, so this looks odd?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [git commit] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize

[Yann E. MORIN]

Peter, All,

On 2024-01-10 20:37 +0100, Peter Korsgaard spake thusly:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
>  > qt6base installs things in /usr/mkspecs, but also the soon to be added
>  > qt6core5compat, and the existing package qwt as well.
[--SNIP--]
>  > 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
> Hmm, qwt is a qt5 package, so this looks odd?

Ah, indeed, I didn't realise that. The original was a hard-coded removal
of $(TARGET_DIR)/usr/mkspecs, so that would have indeed taken care of
the removal for qwt, qt6base and any other qt6 package.

However, I changed it to a qt6base target-finalize hook when aplying,
and I did not realise qwt was not a qt6 package.

For Qt6, the /usr/mkspec is really a qt6base thing, so I still believe
it makes sense that it is a qt6base target-fionalize hook. For qwt, this
is an issue specific to qwt, not qt5base, so it makes sense to keep it
as an ad-goc fixup.

I'll revert the qwt part.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot