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

CSL_jll: Fix libatomic path for FreeBSD #57811

Merged
merged 1 commit into from
Mar 18, 2025

Conversation

topolarity
Copy link
Member

This is required to avoid introducing a name / binding in the Module without a corresponding definition.

Resolves #57808

@topolarity topolarity requested a review from staticfloat March 18, 2025 00:02
Comment on lines 9 to 11
if !Sys.isfreebsd()
export libatomic
end
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Hard-coding the wrong soname would do that:

if !Sys.isfreebsd()
const _libatomic_path = BundledLazyLibraryPath("libatomic.so.1")
end
it's libatomic.so.3, not libatomic.so.1

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for pointing that out @giordano , I think you're right.

This is required to avoid introducing a name / binding in the Module
without a corresponding definition.
@topolarity topolarity changed the title CSL_jll: Conditionally export libatomic CSL_jll: Fix libatomic path for FreeBSD Mar 18, 2025
@topolarity topolarity added backport 1.12 Change should be backported to release-1.12 bugfix This change fixes an existing bug labels Mar 18, 2025
@giordano giordano added the merge me PR is reviewed. Merge when all tests are passing label Mar 18, 2025
@Keno Keno merged commit bc98abc into JuliaLang:master Mar 18, 2025
9 of 11 checks passed
@staticfloat
Copy link
Member

Yes, when manually putting these files together, I must have searched for the presence of libatomic.so.1, not libatomic.so.*. Whoops.

@topolarity topolarity removed the merge me PR is reviewed. Merge when all tests are passing label Mar 19, 2025
@KristofferC KristofferC removed the backport 1.12 Change should be backported to release-1.12 label Mar 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix This change fixes an existing bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CompilerSupportLibraries_jll missing libatomic
5 participants