[FlatpakSDK] Import ccache 4.4.2 over fdo-sdk 4.4.0

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Lauro Moura]

The ccache version shipped with the current FlatpakSDK is 4.4.0 (through fdo's flatpak sdk), which is affected by a bug[1] that could trigger false positive direct hits by failing to track modifications in some header files in some special cases.

This has led to some strange issues in the GTK/WPE ports last few weeks, with erratic builds that produced green built-products but triggered errors when running the tests, failed builds with linking errors and other mysterious problems.

The issue is fixed in ccache 4.4.2[2], already imported in the main fdo-sdk branch.

[1] https://github.com/ccache/ccache/issues/935
[2] https://ccache.dev/releasenotes.html#_ccache_4_4_2

[Lauro Moura]

Created attachment 442563 [details]
Patch

[Philippe Normand]

Comment on attachment 442563 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=442563&action=review

> Tools/buildstream/ChangeLog:3
> +        [Flatpak SDK] Import ccache 4.4.2 over fdo-sdk 4.4.0

What I'd do usually is patch the FDO junction. It's less readable but better for future maintenance I think.

[Philippe Normand]

Actually it was updated upstream already: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/release/21.08/elements/components/ccache.bst

If you update the junction ref I think you should get the new version, no need to import a recipe here. The new version is not in a tagged release yet though, so you'd need to change the source kind I think... https://github.com/WebKit/WebKit/blob/main/Tools/buildstream/elements/freedesktop-sdk.bst#L3

[Lauro Moura]

Created attachment 442667 [details]
Updated patch adding patch to junction

[EWS]

Downloading beautifulsoup4-4.9.3...
Installing beautifulsoup4-4.9.3...
Installed beautifulsoup4-4.9.3!
Downloading soupsieve-1.9.6...
Installing soupsieve-1.9.6...
Installed soupsieve-1.9.6!
/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/bs4/element.py:16: UserWarning: The soupsieve package is not installed. CSS selectors cannot be used.
  'The soupsieve package is not installed. CSS selectors cannot be used.'
Downloading attrs-18.1.0...
Installing attrs-18.1.0...
Installed attrs-18.1.0!
Downloading mechanize-0.4.5...
Installing mechanize-0.4.5...
Installed mechanize-0.4.5!
Traceback (most recent call last):
  File "Tools/Scripts/webkit-patch", line 42, in <module>
    from webkitpy.tool.main import WebKitPatch
  File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/main.py", line 39, in <module>
    from webkitpy.tool import commands
  File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/commands/__init__.py", line 7, in <module>
    from webkitpy.tool.commands.queries import *
  File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/tool/commands/queries.py", line 48, in <module>
    from webkitpy.common.net.buildbot import BuildBot
  File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/common/net/buildbot/__init__.py", line 5, in <module>
    from .buildbot import BuildBot, Builder, Build
  File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py", line 45, in <module>
    from mechanize import Browser
ModuleNotFoundError: No module named 'mechanize'

[Lauro Moura]

Comment on attachment 442667 [details]
Updated patch adding patch to junction

Retrying cq+ after webkitpy hiccup in the previous attempt.

[EWS]

Committed r284978 (243626@main): <https://commits.webkit.org/243626@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 442667 [details].

[Radar WebKit Bug Importer]

<rdar://problem/84758248>