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 libssh2 inclusion in libgit2 iOS build script #533

Merged
merged 1 commit into from
Nov 10, 2015

Conversation

phatblat
Copy link
Member

The update_libgit2_ios build script was mistakenly picking up libssh2 (version 1.6.0) from homebrew instead of the local version built specifically for iOS (currently 1.4.3).

-- checking for module 'libssh2'
--   found libssh2, version 1.4.3_DEV
-- Looking for libssh2_userauth_publickey_frommemory in ssh2
-- Looking for libssh2_userauth_publickey_frommemory in ssh2 - not found

Resolves #531

- Added CMAKE_PREFIX_PATH to arch-specific libssh2 root dir
- Added PKG_CONFIG_USE_CMAKE_PREFIX_PATH so things actually make sense
- Removed unused LIBSSH2_INCLUDE_DIRS
@joshaber
Copy link
Member

Thanks so much for tracking this down!

joshaber added a commit that referenced this pull request Nov 10, 2015
Fix libssh2 inclusion in libgit2 iOS build script
@joshaber joshaber merged commit 452bdaf into libgit2:master Nov 10, 2015
@dleehr
Copy link
Contributor

dleehr commented Nov 10, 2015

Looks good over here. I notice the build log no longer mentions Looking for SSLCreateContext in /Applications/Xcode.app... but that doesn't seem to be a problem. Thanks @phatblat !

@phatblat phatblat deleted the ben/ssh2fix branch November 10, 2015 17:24
@pietbrauer pietbrauer mentioned this pull request Dec 31, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants