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.

Sign up for GitHub

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

Jump to bottom

[deps/libssh2]: fix import library name #45914

Merged
merged 3 commits into from
Sep 6, 2022
Merged

[deps/libssh2]: fix import library name #45914

merged 3 commits into from
Sep 6, 2022

Conversation

inkydragon
Copy link
Sponsor Member

@inkydragon inkydragon commented Jul 3, 2022 •
edited
Loading

xref issue: #45645 (comment)
import lib should be named libssh2.dll.a instead of liblibssh2.dll.a.

@inkydragon inkydragon marked this pull request as ready for review July 3, 2022 14:50
@inkydragon inkydragon added domain:building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries labels Jul 3, 2022
@inkydragon
Copy link
Sponsor Member Author

inkydragon commented Jul 5, 2022 •
edited
Loading

https://github.com/JuliaBinaryWrappers/LibSSH2_jll.jl/releases
The import library in release also has this problem:

$ tar -tvf LibSSH2.v1.10.2.x86_64-w64-mingw32.tar.gz
drwxr-xr-x 0/0               0 1970-01-01 08:00 bin
-rwxr-xr-x 0/0          416261 1970-01-01 08:00 bin/libssh2.dll
drwxr-xr-x 0/0               0 1970-01-01 08:00 lib
-rw-r--r-- 0/0          161378 1970-01-01 08:00 lib/liblibssh2.dll.a

@inkydragon inkydragon mentioned this pull request Jul 5, 2022
Closed
11 tasks
@giordano
Copy link
Contributor

giordano commented Jul 6, 2022

static lib should be named libssh2.dll.a instead of liblibssh2.dll.a.

That's not a static library, but an import library.

@inkydragon inkydragon changed the title [deps/libssh2]: fix static lib name [deps/libssh2]: fix import library name Jul 7, 2022
@staticfloat
Copy link
Sponsor Member

Looks good to me! Do we need to do this in Yggdrasil as well?

@inkydragon
Copy link
Sponsor Member Author

Do we need to do this in Yggdrasil as well?

I think it's good to apply this patch to Yggdrasil.

To avoid breaking libraries that already depend on the name liblibssh2.dll.a, perhaps we could also add a hard link (liblibssh2.dll.a -> libssh2.dll.a)

inkydragon added a commit to fork4jl/Yggdrasil that referenced this pull request Jul 15, 2022
@inkydragon
[LibSSH2] Fix import lib name on windows
102b26d 
`liblibssh2.dll.a` ==> `libssh2.dll.a`
xref: JuliaLang/julia#45914
@inkydragon inkydragon mentioned this pull request Jul 15, 2022
Merged
giordano pushed a commit to JuliaPackaging/Yggdrasil that referenced this pull request Jul 15, 2022
@inkydragon
[LibSSH2] Fix import lib name on windows (#5154)
e974fd4 
* [LibSSH2] Fix import lib name on windows

`liblibssh2.dll.a` ==> `libssh2.dll.a`
xref: JuliaLang/julia#45914

* [LibSSH2] copy import lib to maintain backwards compatibility

copy `libssh2.dll.a` => `liblibssh2.dll.a`

* [libSSH2] Revert a4df288
@ViralBShah
Copy link
Member

Merge?

@staticfloat staticfloat merged commit d8ffddd into JuliaLang:master Sep 6, 2022
@inkydragon inkydragon deleted the source-build--libssh2 branch September 6, 2022 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@staticfloat staticfloat staticfloat approved these changes

Assignees
No one assigned
Labels
domain:building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@inkydragon @giordano @staticfloat @ViralBShah