Add a QMakePackage base class (#4925)

* Add a QMakePackage base class

* Fix sqlite linking bug in qt-creator

* Add latest version of qt-creator

* Add latest version of qwt

* Use raw strings for regular expressions

* Increase minimum required version of qt

* Add comment about specific version of sqlite required

* Fixes for latest version of qwt and qt-creator

* Older versions of Qwt only work with older versions of Qt
This commit is contained in:
Adam J. Stewart
2017-08-04 10:46:07 -05:00
committed by Gregory Lee
parent f6c2adc0ad
commit 452f382293
10 changed files with 159 additions and 35 deletions

View File

@@ -23,24 +23,36 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
import os
class QtCreator(Package):
class QtCreator(QMakePackage):
"""The Qt Creator IDE."""
homepage = 'https://www.qt.io/ide/'
url = 'http://download.qt.io/official_releases/qtcreator/4.1/4.1.0/qt-creator-opensource-src-4.1.0.tar.gz'
url = 'http://download.qt.io/official_releases/qtcreator/4.3/4.3.1/qt-creator-opensource-src-4.3.1.tar.gz'
list_url = 'http://download.qt.io/official_releases/qtcreator/'
list_depth = 2
version('4.1.0', '657727e4209befa4bf5889dff62d9e0a')
version('4.3.1', '6769ea47f287e2d9e30ff92acb899eef')
version('4.1.0', '657727e4209befa4bf5889dff62d9e0a')
depends_on("qt")
depends_on('qt@5.6.0:+opengl')
# Qt Creator comes bundled with its own copy of sqlite. Qt has a build
# dependency on Python, which has a dependency on sqlite. If Python is
# built with a different version of sqlite than the bundled copy, it will
# cause symbol conflict. Force Spack to build with the same version of
# sqlite as the bundled copy.
depends_on('sqlite@3.8.10.2')
def install(self, spec, prefix):
os.environ['INSTALL_ROOT'] = self.prefix
qmake = which('qmake')
qmake('-r')
make()
make("install")
# Qt Creator 4.3.0+ requires a C++14 compiler
conflicts('%gcc@:4.8', when='@4.3.0:')
def url_for_version(self, version):
url = 'http://download.qt.io/official_releases/qtcreator/{0}/{1}/qt-creator-opensource-src-{1}.tar.gz'
return url.format(version.up_to(2), version)
def setup_environment(self, spack_env, run_env):
spack_env.set('INSTALL_ROOT', self.prefix)
def qmake_args(self):
return ['-r']

View File

@@ -25,7 +25,7 @@
from spack import *
class Qwt(Package):
class Qwt(QMakePackage):
"""The Qwt library contains GUI Components and utility classes which are
primarily useful for programs with a technical background. Beside a
framework for 2D plots it provides scales, sliders, dials, compasses,
@@ -33,18 +33,17 @@ class Qwt(Package):
ranges of type double.
"""
homepage = "http://qwt.sourceforge.net/"
url = "https://downloads.sourceforge.net/project/qwt/qwt/5.2.2/qwt-5.2.2.tar.bz2"
url = "https://sourceforge.net/projects/qwt/files/qwt/6.1.3/qwt-6.1.3.tar.bz2"
version('6.1.3', '19d1f5fa5e22054d22ee3accc37c54ba')
version('5.2.2', '70d77e4008a6cc86763737f0f24726ca')
depends_on("qt")
def install(self, spec, prefix):
depends_on('qt+opengl')
# Qwt 6.1.1 and older use a constant that was removed in Qt 5.4
# https://bugs.launchpad.net/ubuntu/+source/qwt-qt5/+bug/1485213
depends_on('qt@:5.3', when='@:6.1.1')
def patch(self):
# Subvert hardcoded prefix
filter_file(r'/usr/local/qwt-\$\$VERSION', prefix, 'qwtconfig.pri')
qmake = which('qmake')
qmake()
make()
make("install")
filter_file(r'/usr/local/qwt-\$\$(QWT_)?VERSION.*',
self.prefix, 'qwtconfig.pri')

View File

@@ -33,8 +33,12 @@ class Sqlite(AutotoolsPackage):
"""
homepage = "www.sqlite.org"
version('3.20.0', 'e262a28b73cc330e7e83520c8ce14e4d',
url='https://www.sqlite.org/2017/sqlite-autoconf-3200000.tar.gz')
version('3.18.0', 'a6687a8ae1f66abc8df739aeadecfd0c',
url='https://www.sqlite.org/2017/sqlite-autoconf-3180000.tar.gz')
version('3.8.10.2', 'a18bfc015cd49a1e7a961b7b77bc3b37',
url='https://www.sqlite.org/2015/sqlite-autoconf-3081002.tar.gz')
version('3.8.5', '0544ef6d7afd8ca797935ccc2685a9ed',
url='https://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz')