| Message ID | 20201124065917.1567055-1-angelo@amarulasolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/4] package/pkg-qmake: adding FOO_SYNC_HEADERS | expand |
On Tue, 24 Nov 2020 07:59:14 +0100 Angelo Compagnucci <angelo@amarulasolutions.com> wrote: > Some qmake based packages need to call the syncqt.pl script before > building to have a properly populated "include" directory inside > the package build tree. > This script is automatically executed by qmake when a source tree > is from a git clone: buildroot purges the .git directory hence the > script never runs. > > Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> Thanks! I have applied this, but after doing some changes. First, I renamed the variable to <pkg>_SYNC_QT_HEADERS. > +ifdef $(2)_SYNC_HEADERS Changed to ifeq (..., YES). Indeed, with an ifdef, even setting SYNC_HEADERS = NO would have triggered the thing, which would have not been expected. > +$(2)_DEPENDENCIES += host-perl > +endif > + > # > # Configure step. Only define it if not already defined by the package > # .mk file. > @@ -52,6 +56,7 @@ ifndef $(2)_CONFIGURE_CMDS > define $(2)_CONFIGURE_CMDS > $$(QT5_QT_CONF_FIXUP) > cd $$($(2)_BUILDDIR) && \ > + $$(if $$($(2)_SYNC_HEADERS), $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) &&) \ I moved this out into a pre-configure hook, following the model that we use for running autoreconf on autotools packages. Thanks! Thomas
diff --git a/docs/manual/adding-packages-qmake.txt b/docs/manual/adding-packages-qmake.txt index e1621e914e..c7e6ff354a 100644 --- a/docs/manual/adding-packages-qmake.txt +++ b/docs/manual/adding-packages-qmake.txt @@ -79,3 +79,7 @@ also be defined. * +LIBFOO_INSTALL_TARGET_OPTS+, to specify additional targets to pass to the +make+ command during the target installation step. By default, +install+. + +* +LIBFOO_SYNC_HEADERS+, to run syncqt.pl before qmake. Some packages + need this to have a properly populated include directory before + running the build. diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index 27727119d7..24bf0f7940 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -44,6 +44,10 @@ ifneq ($(1),qt5base) $(2)_DEPENDENCIES += qt5base endif +ifdef $(2)_SYNC_HEADERS +$(2)_DEPENDENCIES += host-perl +endif + # # Configure step. Only define it if not already defined by the package # .mk file. @@ -52,6 +56,7 @@ ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS $$(QT5_QT_CONF_FIXUP) cd $$($(2)_BUILDDIR) && \ + $$(if $$($(2)_SYNC_HEADERS), $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) &&) \ $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) endef endif
Some qmake based packages need to call the syncqt.pl script before building to have a properly populated "include" directory inside the package build tree. This script is automatically executed by qmake when a source tree is from a git clone: buildroot purges the .git directory hence the script never runs. Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> --- Changelog v1 -> v2: * Fixed hash file (suggested by Peter) v2 -> v3: * Moved to use FOO_INCLUDE_FIXUP v3 -> v4: * Renamed FOO_INCLUDE_FIXUP to FOO_SYNC_HEADERS docs/manual/adding-packages-qmake.txt | 4 ++++ package/pkg-qmake.mk | 5 +++++ 2 files changed, 9 insertions(+)