[Buildroot] [PATCH v6 05/28] package/qwt: Partially convert to qmake infra
Andreas Naumann
anaumann at ultratronik.de
Mon Feb 17 21:23:27 UTC 2020
Use the qmake infra CONFIGURE and BUILD generic but keep the manipulation
of qwtconfig.pri as PRE_CONFIGURE_HOOK as well as the custom install steps.
Signed-off-by: Andreas Naumann <anaumann at ultratronik.de>
---
package/qwt/qwt.mk | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index e0ffec765f..1fec17b19a 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -41,14 +41,11 @@ else
QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/QWT_CONFIG += QwtDll/'
endif
-define QWT_CONFIGURE_CMDS
+define QWT_PRE_CONFIGURE_CMD
$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
- (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
endef
-define QWT_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
+QWT_PRE_CONFIGURE_HOOKS += QWT_PRE_CONFIGURE_CMD
# After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so
# that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and
@@ -64,4 +61,4 @@ define QWT_INSTALL_TARGET_CMDS
rm -Rf $(TARGET_DIR)/usr/mkspecs
endef
-$(eval $(generic-package))
+$(eval $(qmake-package))
--
2.25.0
More information about the buildroot
mailing list