| Message ID | 20220215015307.855341-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v8,1/5] package/qt5/qt5base: enable ccache via configure option | expand |
Hi, On 15/02/2022 02.53, James Hilliard wrote: > This should be cleaner than editing mkspecs/common/g++-base.conf. > > This should be more reliable with qt5webengine gn build system. > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > Changes v6 -> v7: > - remove QT5BASE_CONFIGURE_HOSTCC variable Committed, thanks. -- Bye, Peter Korsgaard
On 15/02/2022 02.53, James Hilliard wrote: > This should be cleaner than editing mkspecs/common/g++-base.conf. > > This should be more reliable with qt5webengine gn build system. > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > Changes v6 -> v7: > - remove QT5BASE_CONFIGURE_HOSTCC variable > --- > package/qt5/qt5base/qt5base.mk | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef38d03253..cce92db81b 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -297,10 +297,9 @@ endef > endif > > # This allows to use ccache when available > -define QT5BASE_CONFIGURE_HOSTCC > - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf > - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf As pointed out by Yann on IRC, with this dropped we no longer enforce that HOSTCC / HOSTCXX is used, so I've left in this hunk but changed to the _NOCCACHE variants. -- Bye, Peter Korsgaard
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..cce92db81b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -297,10 +297,9 @@ endef endif # This allows to use ccache when available -define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf -endef +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif # Must be last so can override all options set by Buildroot QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) @@ -316,7 +315,6 @@ define QT5BASE_CONFIGURE_CMDS touch $(QT5BASE_ARCH_CONFIG_FILE) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBATOMIC) $(QT5BASE_CONFIGURE_ARCH_CONFIG_LIBEXECINFO) - $(QT5BASE_CONFIGURE_HOSTCC) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
This should be cleaner than editing mkspecs/common/g++-base.conf. This should be more reliable with qt5webengine gn build system. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- Changes v6 -> v7: - remove QT5BASE_CONFIGURE_HOSTCC variable --- package/qt5/qt5base/qt5base.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)