mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
config BR2_PACKAGE_QWT
|
||||
bool "qwt"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport
|
||||
select BR2_PACKAGE_QT5BASE_CONCURRENT
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
# From https://sourceforge.net/projects/qwt/files/qwt/6.1.3/
|
||||
sha1 90ec21bc42f7fae270482e1a0df3bc79cb10e5c7 qwt-6.1.3.tar.bz2
|
||||
md5 19d1f5fa5e22054d22ee3accc37c54ba qwt-6.1.3.tar.bz2
|
||||
# From https://sourceforge.net/projects/qwt/files/qwt/6.1.5/
|
||||
sha1 07c71427f1f4bbd0354b3a98965943ce2f220766 qwt-6.1.5.tar.bz2
|
||||
md5 d65582f99312796ed42c3be3208ed3db qwt-6.1.5.tar.bz2
|
||||
|
||||
# Locally computed
|
||||
sha256 4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041 qwt-6.1.5.tar.bz2
|
||||
sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING
|
||||
|
||||
@@ -4,11 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QWT_VERSION = 6.1.3
|
||||
QWT_VERSION = 6.1.5
|
||||
QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
|
||||
QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
|
||||
QWT_INSTALL_STAGING = YES
|
||||
QWT_DEPENDENCIES = qt5base
|
||||
|
||||
QWT_LICENSE = LGPL-2.1 with exceptions
|
||||
QWT_LICENSE_FILES = COPYING
|
||||
@@ -19,6 +18,7 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%'
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QWT_SVG),y)
|
||||
QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
|
||||
QWT_DEPENDENCIES += qt5svg
|
||||
else
|
||||
QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
|
||||
endif
|
||||
@@ -41,14 +41,11 @@ else
|
||||
QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/QWT_CONFIG += QwtDll/'
|
||||
endif
|
||||
|
||||
define QWT_CONFIGURE_CMDS
|
||||
define QWT_TWEAK_QWTCONFIG_PRI
|
||||
$(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_TWEAK_QWTCONFIG_PRI
|
||||
|
||||
# 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))
|
||||
|
||||
Reference in New Issue
Block a user