packaging: use our patchelf branch
Metadata
Current evaluation
Merged into master to fix s390x build failures by switching patchelf to a custom branch with a failing test disabled. The one-line change was approved, passed CI, and integrated.
Suggested action: —
No scores available.
Issue body
Upstream patchelf issue NixOS/patchelf#167 prevents package building on
s390x. The test failure is apparently not significant for our use cases, so
switch patchelf sources to a branch with the offending test disabled.
Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>
Note: this PR requires patchelf PR snapcore/patchelf#1 to be merged before
running tests on s390x.
- [x] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)?
- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [ ] Have you successfully run `./runtests.sh static`?
- [ ] Have you successfully run `./runtests.sh tests/unit`?
-----
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged into master to fix s390x build failures by switching patchelf to a custom branch with a failing test disabled. The one-line change was approved, passed CI, and integrated. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged into master. Replaced upstream patchelf with a custom branch to bypass a test failure blocking s390x builds. Requires a dependent patchelf PR. Codecov reported a negligible coverage decrease. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged. Updated packaging to use a custom patchelf branch, bypassing an upstream test failure that blocked s390x builds. Requires a separate patchelf PR to be merged first. Codecov shows negligible coverage impact. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #3588 snap: patch patchelf on riscv64 (CRAFT-566) | snapcraft | merged | Merged to master. Conditionally applies patchelf patches on riscv64 to prevent breaking other architectures. Approved by one reviewer, passed CI, and added 104 lines across three files without impacting test coverage. | |
| #3589 snap: correct patch apply for patchelf | snapcraft | merged | Merged a two-line fix correcting patch application for patchelf. Approved by a reviewer, passed CI, and merged to master. An unrelated test failure was noted but disregarded to proceed. | |
| #5486 build: add patchelf to make dependencies | snapcraft | merged | Merged to add patchelf to development environment dependencies, resolving test failures on self-hosted runners. Approved by two reviewers and passed CI checks. | |
| #1967 project_loader: improve the logic to install patchelf as a build tool | snapcraft | merged | Merged changes improving patchelf installation logic by excluding it on xenial/armhf and xenial/s390x due to broken builds. Users must provide it manually or use the build-snap. Approved and merged after clarifying error handling and architecture exclusions. | |
| #2519 packaging: use local patchelf | snapcraft | merged | Merged. Relinked dynamic executables with the system linker to resolve set-rpath segfaults in Go binaries. Integrates upstream patchelf 0.10 to correctly set interpreters and fix ELF section layout issues. | |
| #2531 snap: revert to patchelf 0.9 with local patches | snapcraft | merged | Merged a revert to patchelf 0.9 with local patches after version 0.10 generated unreliable binaries on i386, ppc64el, and s390x. The change restores build stability pending upstream fixes. | |
| #2006 many: use packaging logic to get patchelf | snapcraft | merged | Merged following reviewer approval and CI checks. Refactored patchelf retrieval to use shared packaging logic, aligning its version across snap and deb packages. Modified four files with a net reduction of 24 lines. | |
| #1873 elf: cleaner patchelf experience | snapcraft | merged | Merged improvements to patchelf handling. The change uses the system patchelf by default, copies files to prevent hard-link conflicts, and provides fallback instructions. Approved by two reviewers and passed CI checks before merging. | |
| #5135 fix(test): add patchelf to dev dependencies for testing | snapcraft | closed | Superseded by PR #5225. The pull request adding patchelf to dev dependencies was closed as obsolete after maintainers discussed architectural concerns regarding patchelf usage in tests and development environments. | |
| #1888 elf: make patchelf a dependency | snapcraft | merged | Merged after reviewer approval and CI checks. The change corrects patchelf handling by removing it from build_tools and properly configuring it as a dependency via debian/control for deb packages and snapcraft bundling for snaps. |