Skip to content

qscintilla#16182

Merged
adamjstewart merged 4 commits intospack:developfrom
citibeth:efischer/2004-qscintilla
May 6, 2020
Merged

qscintilla#16182
adamjstewart merged 4 commits intospack:developfrom
citibeth:efischer/2004-qscintilla

Conversation

@citibeth
Copy link
Copy Markdown
Member

In order for Qt packages to find their dependencies, the QMAKEFEATURE env var must be set appropriately at build time. This PR adds that necessary step.

Copy link
Copy Markdown
Member

@adamjstewart adamjstewart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Sinan81 can you take a look?

@adamjstewart
Copy link
Copy Markdown
Member

We could also set this in Qt's setup_dependent_build_environment so that all packages can share it.

@adamjstewart
Copy link
Copy Markdown
Member

I think this needs to be done in the qt package if you want it set for packages that depend on Qt.

Elizabeth Fischer added 2 commits May 4, 2020 07:25
@citibeth
Copy link
Copy Markdown
Member Author

citibeth commented May 4, 2020

OK I moved the logic to qt/package.py. Please review...

@adamjstewart
Copy link
Copy Markdown
Member

Flake8:

var/spack/repos/builtin/packages/qt/package.py:226: [E501] line too long (99 > 79 characters)

@adamjstewart
Copy link
Copy Markdown
Member

This looks good to me, but maybe @Sinan81 or @sethrj can review this before I merge.

Copy link
Copy Markdown
Contributor

@sethrj sethrj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find. Looks good to me!

@adamjstewart adamjstewart merged commit 1aacdc4 into spack:develop May 6, 2020
@ax3l
Copy link
Copy Markdown
Member

ax3l commented May 7, 2020

I am afraid this PR broke builds for py-pyqt5:

2020-05-07T06:28:55.9981730Z ==> 1000: Installing py-pyqt5
2020-05-07T06:28:59.1368670Z ==> Warning: microarchitecture specific optimizations are not supported yet on mixed compiler toolchains [check [email protected] for further details]
2020-05-07T06:28:59.1445910Z ==> Error: AttributeError: 'Spec' object has no attribute 'stage'
2020-05-07T06:28:59.1446090Z 
2020-05-07T06:28:59.1446220Z /Users/runner/runners/2.169.1/work/spack/spack/spack/var/spack/repos/builtin/packages/qt/package.py:227, in setup_dependent_build_environment:
2020-05-07T06:28:59.1446720Z         224        env.set('QTDIR', self.prefix)
2020-05-07T06:28:59.1447290Z         225        # https://riverbankcomputing.com/pipermail/qscintilla/2015-January/001012.html
2020-05-07T06:28:59.1447780Z         226        env.set('QMAKEFEATURES', join_path(
2020-05-07T06:28:59.1448260Z   >>    227            dependent_spec.stage.source_path, 'Qt4Qt5', 'features'))
2020-05-07T06:28:59.1448340Z 
2020-05-07T06:28:59.1448380Z 
2020-05-07T06:28:59.3749430Z ==> Error: Failed to install py-pyqt5 due to ChildError: AttributeError: 'Spec' object has no attribute 'stage'

which in turn breaks the py-jupyter build stack. First seen on macOS nightly integration tests:
https://github.com/spack/spack/actions/runs/97707878

@citibeth
Copy link
Copy Markdown
Member Author

citibeth commented May 7, 2020 via email

@ax3l
Copy link
Copy Markdown
Member

ax3l commented May 7, 2020

@citibeth sounds good to me, do you mind opening a PR please?

@citibeth citibeth mentioned this pull request May 7, 2020
@citibeth
Copy link
Copy Markdown
Member Author

citibeth commented May 7, 2020

See #16516

@ax3l
Copy link
Copy Markdown
Member

ax3l commented May 8, 2020

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants