Skip to content

ccache: update to version 4.7.4 and fix USE_CCACHE build issues #4564

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

anphel31
Copy link
Member

@anphel31 anphel31 commented Jan 7, 2023

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
Make changes to support building all core mariner packages with USE_CCACHE. Update to the latest available version of ccache (4.7.4). Remove ccache symlinks to clang when clang is not installed. This resolves issues building some packages (such as systemd) where meson detects clang in the path, but errors out (since the clang symlinks were created and the clang package was not installed). Also fix package failures that "BuildRequires: swig" by modifying the swig package to create a separate swig-ccache package, which contains the the ccache-swig binary and ccache swig symlink.

Change Log
  • Update ccache package to latest version 4.7.4
  • Remove clang symlinks for ccache when clang is not installed
  • Change swig.spec to generate separate swig-ccache package
Does this affect the toolchain?

YES

Test Methodology
  • Pipeline build id: xxxx

@ghost ghost added the main PR Destined for main label Jan 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
main PR Destined for main
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant