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

Fix rpaths patcher being run on symbolic links #5181

Merged
merged 5 commits into from
Feb 14, 2024

Conversation

mbargull
Copy link
Member

@mbargull mbargull commented Feb 12, 2024

Description

Use skip_symlinks=True for former is_codefile/codefile_type calls.
This just mechanically adds skip_symlinks=True to the calls sides that previously had this implicitly (before 1dc2470).

Fixes gh-5179 .

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Feb 12, 2024
@mbargull mbargull force-pushed the fix-no-set-rpath-for-symlink branch 3 times, most recently from b804498 to 9a141c2 Compare February 12, 2024 18:09
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@mbargull mbargull force-pushed the fix-no-set-rpath-for-symlink branch from 9a141c2 to fc984b1 Compare February 12, 2024 20:18
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@mbargull mbargull force-pushed the fix-no-set-rpath-for-symlink branch from a04e512 to b6d99fa Compare February 12, 2024 23:09
@mbargull mbargull marked this pull request as ready for review February 13, 2024 00:14
@mbargull
Copy link
Member Author

This currently targets 3.28.x since 24.1 is not yet used in conda-forge.
We should do one of these:

  1. Create new patch releases for 3.28/24.1,
  2. Create a patch release for 24.1 and use build/use that package on conda-forge.
  3. Add https://github.com/conda/conda-build/pull/5181.patch as a patch in conda-forge/conda-build-feedstock and build a 3.28.4.post1 in case we can't do 3.28 release and can't use 24.1 in production yet.

This bug is a bit problematic since it doesn't cause builds to outright fail, but rather leads to silently create partially broken packages..

tests/test_post.py Outdated Show resolved Hide resolved
Copy link
Contributor

@kenodegard kenodegard left a comment

Choose a reason for hiding this comment

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

wow this was sneaky, I went back through the old PRs and agree that these are the old is_codefile/codefile_type calls

I'm in favor of doing another 24.1 patch, I'd prefer not to do another 3.28 unless we absolutely have to

tests/test_post.py Outdated Show resolved Hide resolved
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
@mbargull
Copy link
Member Author

wow this was sneaky

Indeed -- kind of fortunate that we ran into the patchelf bug to notice it :).

I'm in favor of doing another 24.1 patch, I'd prefer not to do another 3.28 unless we absolutely have to

How about we merge this, release 24.1.2 and build it on conda-forge today and only if something else breaks, we look at 3.28 again?

@mbargull mbargull changed the base branch from 3.28.x to 24.1.x February 13, 2024 09:16
@kenodegard kenodegard linked an issue Feb 13, 2024 that may be closed by this pull request
@kenodegard kenodegard merged commit fc9436d into conda:24.1.x Feb 14, 2024
26 checks passed
@leofang leofang mentioned this pull request Feb 20, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Incorrect library load paths due to rpath patcher run on symlinks
3 participants