Skip to content

libarchive: backport fix for static linking#212540

Merged
wegank merged 1 commit intomasterfrom
unknown repository
Jan 26, 2023
Merged

libarchive: backport fix for static linking#212540
wegank merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jan 25, 2023 •
edited by ghost
Loading

Description of changes

libarchive 3.6.2 broke static linking, which is causing the nixStatic jobs to fail on Hydra:

This commit backports the fix (merged upstream) from libarchive 3.6.3 (unreleased).

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ghost
Copy link
Copy Markdown
Author

ghost commented Jan 25, 2023

@ofborg eval

@ofborg ofborg bot requested review from AndersonTorres and jcumming January 25, 2023 08:34
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 25, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Jan 25, 2023

ye gads, rebuild city.

@ghost
Copy link
Copy Markdown
Author

ghost commented Jan 25, 2023

@ofborg eval

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 25, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Jan 25, 2023

Yay less red.

AndersonTorres
AndersonTorres suggested changes Jan 25, 2023
View reviewed changes
@AndersonTorres
Copy link
Copy Markdown
Member

AndersonTorres commented Jan 25, 2023

Also, squash the commits into only one.

@AndersonTorres
libarchive: backport fix for static linking
201148d 
libarchive 3.6.2 broke static linking, which is causing the
nixStatic jobs to fail on Hydra:

- https://hydra.nixos.org/job/nixpkgs/cross-trunk/powerpc64le-nixCrossStatic.nixStatic.x86_64-linux
- https://hydra.nixos.org/job/nixpkgs/cross-trunk/mips64el-nixCrossStatic.nixStatic.x86_64-linux

This commit backports the fix (merged upstream) from libarchive
3.6.3.

Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
@ghost
Copy link
Copy Markdown
Author

ghost commented Jan 25, 2023

Also, squash the commits into only one.

Done.

@ghost ghost requested review from AndersonTorres and removed request for AndersonTorres and jcumming January 25, 2023 12:57
AndersonTorres
AndersonTorres approved these changes Jan 25, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM, waiting ofBorg.

@wegank wegank merged commit 08bb609 into NixOS:master Jan 26, 2023
@ghost ghost deleted the pr/libarchive/unbreak-static branch January 27, 2023 02:08
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 9, 2023

Backport failed for release-22.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-22.11
git worktree add -d .worktree/backport-212540-to-release-22.11 origin/release-22.11
cd .worktree/backport-212540-to-release-22.11
git checkout -b backport-212540-to-release-22.11
ancref=$(git merge-base 98f981942ed81379de1febee48cd2617a3ba07a0 201148d02bd106c593d1def08d05bb410e5c669b)
git cherry-pick -x $ancref..201148d02bd106c593d1def08d05bb410e5c669b

vcunat added a commit that referenced this pull request Feb 9, 2023
@vcunat
libarchive: backport fix for static linking
ece614f 
Picked from commit 201148d from PR #212540
(simplified, as it wouldn't apply anyway)
@Artturin Artturin mentioned this pull request Jan 29, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@AndersonTorres @vcunat @wegank