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.

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

Update Chromium to 90.0.4430.72, combined w/ other open PRs #92

Merged
merged 9 commits into from
Apr 16, 2021
Merged

Conversation

refi64
Copy link
Collaborator

@refi64 refi64 commented Apr 15, 2021

This includes the contents of #86, #88, and #89. @gasinvein this also includes the fix for the terribly stupid portal bug I accidentally added in #89.

@flathubbot
Copy link
Contributor

Started test build 45037

@flathubbot
Copy link
Contributor

Build 45037 failed

@refi64 refi64 mentioned this pull request Apr 15, 2021
@refi64
Copy link
Collaborator Author

refi64 commented Apr 15, 2021

Failed to download sources: module chromium: Can't find file at (null)

Well this is certainly interesting...

@flathubbot
Copy link
Contributor

Started test build 45042

@flathubbot
Copy link
Contributor

Build 45042 failed

@flathubbot
Copy link
Contributor

Started test build 45048

@refi64
Copy link
Collaborator Author

refi64 commented Apr 15, 2021

WELL it looks like we hit a compiler bug, @Erick555 looks like we might be switching to LLVM 11 more quickly than I thought 😅 pulled in your commit from #84 so we'll see if that helps...

@flathubbot
Copy link
Contributor

Build 45048 failed

@refi64
Copy link
Collaborator Author

refi64 commented Apr 15, 2021

Well, looks like LLVM 11 is resulting in other build errors...

After some thought, I believe the best course of action is going to end up being to move to the upstream toolchain at least on x64, which is where the compile crashes were occurring anyway. This also avoids the original concern of longer build times when using the upstream toolchain (the x64 one is prebuilt).

We could, of course, just update for LLVM 11 and try to switch to that, but the fact that there's already something upstream is uses that 11 doesn't is already a pretty harrowing start.

@Erick555
Copy link
Contributor

Erick555 commented Apr 15, 2021

@refi64 please try this patch https://chromium.googlesource.com/chromium/src/+/9909f146b28d56c9c0411329a056ed959b33f76a

EDIT: actually you need to revert it.

The backstory I gathered behind this is that while nomerge was added in llvm11 as statement attribute, only since llvm12 it can be applied to declarations. The check chromium does for feature availability is incorrect for llvm11 which is why it fails there and works for llvm10.

@Erick555
Copy link
Contributor

Erick555 commented Apr 15, 2021

I agree about trying upstream toolchain however using different toolchains among arches may be risky. The question is what will be the fastest fix to unstuck the build. The backlog is quite big now.

@Erick555
Copy link
Contributor

Another alternative is to wait for llvm12 on flathub.

It's usage is incompatible with LLVM 11.
@flathubbot
Copy link
Contributor

Started test build 45082

@refi64
Copy link
Collaborator Author

refi64 commented Apr 15, 2021

@Erick555 thanks for the info, I've added a patch to revert that, so hopefully this will build now.

@flathubbot
Copy link
Contributor

Build 45082 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/43372/org.chromium.Chromium.flatpakref

@gasinvein
Copy link
Member

It works, #53 and #78 seem to be fixed to me.

@refi64 refi64 merged commit a6f832d into master Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants