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

LibGit2: build libgit2 with libssh2 support #17391

Merged
merged 12 commits into from
Jul 16, 2016
Merged

LibGit2: build libgit2 with libssh2 support #17391

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5365943
build libgit2 with libssh2 support
wildart May 24, 2016
d1d80e4
fix typo
wildart Jul 13, 2016
c148d43
get libssh2 from official repo & patch it
wildart Jul 13, 2016
8ea2a3c
rename mbedtls patch
wildart Jul 13, 2016
e272e1e
use release tag for libssh2
wildart Jul 14, 2016
ea3cfb4
fix mbedtls build
wildart Jul 14, 2016
ed41e46
fix libgit2 & libssh2 build
wildart Jul 16, 2016
f6b1a7d
Minor grammar fix in a comment
tkelman Jul 16, 2016
2f2a715
Remove many unrelated changes from libssh2-mbedtls.patch
tkelman Jul 16, 2016
ff3f12d
Remove libgit2-custom-tls.patch for now
tkelman Jul 16, 2016
442fb0a
Minor makefile cleanups
tkelman Jul 16, 2016
90c296d
Add libssh2 and mbedtls to LICENSE and README
tkelman Jul 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions deps/mbedtls.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@ else
endif
MBEDTLS_URL = https://tls.mbed.org/download/$(MBEDTLS_SRC).tgz

MBEDTLS_OBJ_SOURCE := $(BUILDDIR)/mbedtls-$(MBEDTLS_VER)/library/libmbedtls.$(SHLIB_EXT) \
$(BUILDDIR)/mbedtls-$(MBEDTLS_VER)/library/libmbedx509.$(SHLIB_EXT) \
$(BUILDDIR)/mbedtls-$(MBEDTLS_VER)/library/libmbedcrypto.$(SHLIB_EXT)
MBEDTLS_OBJ_TARGET := $(build_shlibdir)/libmbedtls.$(SHLIB_EXT) \
$(build_shlibdir)/libmbedx509.$(SHLIB_EXT) \
$(build_shlibdir)/libmbedcrypto.$(SHLIB_EXT)
MBEDTLS_OBJ_SOURCE := $(BUILDDIR)/mbedtls-$(MBEDTLS_VER)/library/libmbedcrypto.$(SHLIB_EXT)
MBEDTLS_OBJ_TARGET := $(build_shlibdir)/libmbedcrypto.$(SHLIB_EXT)
Copy link
Contributor

Choose a reason for hiding this comment

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

just for clarification purposes, is this the only one of the three that libssh2 needs, or does it actually need all 3?

Copy link
Contributor

Choose a reason for hiding this comment

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

ping. not critical, but for the record would be good to have answers written down to these last minor clarifications while it's fresh in memory

Copy link
Member Author

Choose a reason for hiding this comment

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

I left only one, because if I put three and use this variable as dependency in other Makefiles (libssh2) then make builds it 3 times.


MBEDTLS_OPTS := $(CMAKE_COMMON) -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
-DENABLE_PROGRAMS=OFF -DCMAKE_BUILD_TYPE=Release \
Expand Down