Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qt5.qtwebkit: Fixes modules src being subtly broken. #46383

Merged
merged 1 commit into from Sep 11, 2018
Merged

qt5.qtwebkit: Fixes modules src being subtly broken. #46383

merged 1 commit into from Sep 11, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Sep 8, 2018 •
edited

b785d48 introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level src attribute as source instead of Qt Webkit's own
source.

Were it not for the src top-level attribute (which is a legit
package), the error would have been made obvious by passing null to
src.

This partially reverts newly introduced way src can be passed to a
qtModule, instead relying on extending the srcs attrset.

For ZHF #45960

Motivation for this change
Things done
  • ✔️ Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • ✔️ NixOS
    • ⬜ macOS
    • ⬜ other Linux distributions
  • ⬜ Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • ⬜ Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • ⬜ Tested execution of all binary files (usually in ./result/bin/)
  • ⬜ Determined the impact on package closure size (by running nix path-info -S before and after)
  • ✔️ Fits CONTRIBUTING.md.

cc @bkchr

@samueldr samueldr changed the title [WIP] qt5.*: Fixes modules src being subtly broken. [WIP] qt5.qtwebkit: Fixes modules src being subtly broken. Sep 8, 2018
@samueldr
qt5.qtwebkit: Fixes modules src being subtly broken.
cb38098 
b785d48 introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF NixOS#45960
@samueldr samueldr mentioned this pull request Sep 8, 2018
Closed
@samueldr samueldr changed the title [WIP] qt5.qtwebkit: Fixes modules src being subtly broken. qt5.qtwebkit: Fixes modules src being subtly broken. Sep 11, 2018
@samueldr
Copy link
Member Author

Ugh! Forgot to drop the WIP mention! This might explain why nobody counter-verified this. If anyone subscribed, please comment :).

@samueldr
Copy link
Member Author

@GrahamcOfBorg build qt59.qtwebkit qt56.qtwebkit qt511.qtwebkit

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: qt59.qtwebkit, qt56.qtwebkit, qt511.qtwebkit

Partial log (click to expand)

In file included from ../JavaScriptCore/runtime/Executable.h:39:
In file included from ../JavaScriptCore/parser/SourceCode.h:32:
../JavaScriptCore/parser/SourceProvider.h:58:18: warning: 'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true [-Wundefined-bool-conversion]
            if (!this) // Be defensive in release mode.
                ~^~~~
2 warnings generated.
compiling Modules/indexeddb/IDBLevelDBCoding.cpp
compiling Modules/indexeddb/IDBObjectStore.cpp
building of '/nix/store/69jik6c1c7f1z9wk5n675bpw19r4ly8g-qtwebkit-5.9.1.drv' timed out after 1800 seconds
error: build of '/nix/store/35whzvzamh730yz7pxd8sb2krv42y51s-qtwebkit-5.6.3.drv', '/nix/store/69jik6c1c7f1z9wk5n675bpw19r4ly8g-qtwebkit-5.9.1.drv', '/nix/store/6cb8n4maf0cmcfl9m0rz1jg7w0krav07-qtwebkit-5.212-alpha-01-26-2018.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: qt59.qtwebkit, qt56.qtwebkit, qt511.qtwebkit

Partial log (click to expand)

[ 40%] Generating ../../DerivedSources/WebCore/JSSVGZoomAndPan.cpp, ../../DerivedSources/WebCore/JSSVGZoomAndPan.h
[ 40%] Generating ../../DerivedSources/WebCore/JSSVGZoomEvent.cpp, ../../DerivedSources/WebCore/JSSVGZoomEvent.h
[ 40%] Linking CXX executable ../../../bin/testair
[ 40%] Built target testair
[ 40%] Linking CXX executable ../../../bin/testb3
[ 40%] Built target testb3
[ 40%] Linking CXX executable ../../../bin/jsc
[ 40%] Built target jsc
building of '/nix/store/w2mi5hdppz7wn93gc066x6ddclfpdwxa-qtwebkit-5.212-alpha-01-26-2018.drv' timed out after 3600 seconds
error: build of '/nix/store/gz88i2yypgx497lj2l3pa8rrxnfw1m4s-qtwebkit-5.6.3.drv', '/nix/store/lfxliwyvabdgir1bib0mrsf99jvv2220-qtwebkit-5.9.1.drv', '/nix/store/w2mi5hdppz7wn93gc066x6ddclfpdwxa-qtwebkit-5.212-alpha-01-26-2018.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: qt59.qtwebkit, qt56.qtwebkit, qt511.qtwebkit

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev/lib
patching script interpreter paths in /nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev
checking for references to /build in /nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev...
postPatchMkspecs
fixQtModulePaths: Fixing module paths in `/nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev/mkspecs/modules/qt_lib_webkitwidgets.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev/mkspecs/modules/qt_lib_webkitwidgets_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev/mkspecs/modules/qt_lib_webkit.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/vsp5i1zzhnawn0jrx1f0pqaji6nxggn1-qtwebkit-5.9.1-dev/mkspecs/modules/qt_lib_webkit_private.pri'...
postPatchMkspecs
error: build of '/nix/store/m3irm3x8lafnhalfz2hybj0pm1j34vkh-qtwebkit-5.212-alpha-01-26-2018.drv' failed

bkchr
bkchr approved these changes Sep 11, 2018
View reviewed changes
Copy link
Contributor

@bkchr bkchr left a comment

Choose a reason for hiding this comment

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

Good idea, of just joining the srcs with the qtwebkit definition.
Looks good to me.

@ttuegel ttuegel merged commit ba06e28 into NixOS:master Sep 11, 2018
@samueldr samueldr deleted the zhf/qtwebkits branch September 11, 2018 15:05
@samueldr
Copy link
Member Author

Backported in fce2d40

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

@ttuegel ttuegel ttuegel approved these changes

@bkchr bkchr bkchr approved these changes

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@samueldr @GrahamcOfBorg @ttuegel @bkchr