From: Peter Korsgaard <peter@korsgaard.com>
To: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [git commit] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize
Date: Wed, 10 Jan 2024 20:37:42 +0100 [thread overview]
Message-ID: <87edepasjd.fsf@48ers.dk> (raw)
In-Reply-To: <20231228203217.4C7EC81840@busybox.osuosl.org> (Yann E. MORIN's message of "Thu, 28 Dec 2023 21:31:42 +0100")
>>>>> "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
next prev parent reply other threads:[~2024-01-10 19:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-28 20:31 [Buildroot] [git commit] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize Yann E. MORIN
2024-01-10 19:37 ` Peter Korsgaard [this message]
2024-01-10 20:11 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edepasjd.fsf@48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@buildroot.org \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox