diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/py-pyqt5/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyqt5/package.py | 67 |
1 files changed, 5 insertions, 62 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyqt5/package.py b/var/spack/repos/builtin/packages/py-pyqt5/package.py index bc37d4dcab..e26c66a891 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * -import os class PyPyqt5(SIPPackage): @@ -30,7 +29,8 @@ class PyPyqt5(SIPPackage): version('5.13.0', sha256='0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9') version('5.12.3', sha256='0db0fa37debab147450f9e052286f7a530404e2aaddc438e97a7dcdf56292110') - variant('qsci', default=False, description='Build with QScintilla python bindings') + # API files can be installed regardless if Qscintilla is installed or not + variant('qsci_api', default=False, description='Install PyQt API file for QScintilla') # Without opengl support, I got the following error: # sip: QOpenGLFramebufferObject is undefined @@ -39,15 +39,6 @@ class PyPyqt5(SIPPackage): depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') depends_on('py-sip module=PyQt5.sip', type=('build', 'run')) depends_on('py-sip@:4.19.18 module=PyQt5.sip', type=('build', 'run'), when='@:5.13.0') - depends_on('qscintilla', when='+qsci') - - # For building Qscintilla python bindings - resource(name='qscintilla', - url='https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.10.2/QScintilla_gpl-2.10.2.tar.gz', - sha256='14b31d20717eed95ea9bea4cd16e5e1b72cee7ebac647cba878e0f6db6a65ed0', - destination='spack-resource-qscintilla', - when='^qscintilla@2.10.2' - ) # https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html def configure_args(self): @@ -59,55 +50,7 @@ class PyPyqt5(SIPPackage): self.spec['python'].package.site_packages_dir, 'PyQt5'), ] - if '+qsci' in self.spec: - args.extend(['--qsci-api-destdir', self.prefix.share.qsci]) + if '+qsci_api' in self.spec: + args.extend(['--qsci-api', + '--qsci-api-destdir', self.prefix.share.qsci]) return args - - @run_after('install') - def make_qsci(self): - if '+qsci' in self.spec: - rsrc_py_path = os.path.join( - self.stage.source_path, - 'spack-resource-qscintilla/QScintilla_gpl-' + - str(self.spec['qscintilla'].version), 'Python') - with working_dir(rsrc_py_path): - pydir = join_path( - self.prefix, - self.spec['python'].package.site_packages_dir, - 'PyQt5') - python = self.spec['python'].command - python('configure.py', '--pyqt=PyQt5', - '--sip=' + self.spec['py-sip'].prefix.bin.sip, - '--qsci-incdir=' + - self.spec['qscintilla'].prefix.include, - '--qsci-libdir=' + self.spec['qscintilla'].prefix.lib, - '--qsci-sipdir=' + self.prefix.share.sip.PyQt5, - '--apidir=' + self.prefix.share.qsci, - '--destdir=' + pydir, - '--pyqt-sipdir=' + self.prefix.share.sip.PyQt5, - '--sip-incdir=' + - join_path(self.spec['py-sip'].prefix.include, - 'python' + - str(self.spec['python'].version.up_to(2))), - '--stubsdir=' + pydir) - - # Fix build errors - # "QAbstractScrollArea: No such file or directory" - # "qprinter.h: No such file or directory" - # ".../Qsci.so: undefined symbol: _ZTI10Qsci...." - qscipro = FileFilter('Qsci/Qsci.pro') - link_qscilibs = 'LIBS += -L' + self.prefix.lib +\ - ' -lqscintilla2_qt5' - qscipro.filter('TEMPLATE = lib', - 'TEMPLATE = lib\nQT += widgets' + - '\nQT += printsupport\n' + link_qscilibs) - - make() - - # Fix installation prefixes - makefile = FileFilter('Makefile') - makefile.filter(r'\$\(INSTALL_ROOT\)', '') - makefile = FileFilter('Qsci/Makefile') - makefile.filter(r'\$\(INSTALL_ROOT\)', '') - - make('install') |