Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use mbedtls instead of openssl in libgit2 on Linux #18658

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

Merged
merged 6 commits into from
Sep 26, 2016
Merged

Use mbedtls instead of openssl in libgit2 on Linux #18658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7fbf2a
Add patch from https://github.com/libgit2/libgit2/pull/3462
wildart Sep 24, 2016
48f0f5a
Rebase the libgit2 patch w.r.t. 0.24.1
tkelman Sep 24, 2016
64df291
Build libgit2 against mbedtls
tkelman Sep 24, 2016
cae06f5
Remove some parts of the patch that we don't need to carry here
tkelman Sep 24, 2016
69cdabe
put libssl-dev:i386 back in travis apt-get list
tkelman Sep 24, 2016
f241e23
Make USE_MBEDTLS option default to OFF
tkelman Sep 24, 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
Prev Previous commit
Make USE_MBEDTLS option default to OFF 
otherwise on Mac we're linking to both the system tls library
and mbedtls, and that doesn't work
  • Loading branch information
@tkelman
tkelman committed Sep 24, 2016
commit f241e23db214f008baef80bf6bcf75a6c7efe5f9
2 changes: 1 addition & 1 deletion deps/libgit2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ LIBGIT2_OPTS += -DCURL_INCLUDE_DIRS=$(build_includedir) -DCURL_LIBRARIES="-L$(bu
endif

ifeq ($(OS),Linux)
LIBGIT2_OPTS += -DUSE_OPENSSL=OFF -DCMAKE_INSTALL_RPATH="\$$ORIGIN"
LIBGIT2_OPTS += -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON -DCMAKE_INSTALL_RPATH="\$$ORIGIN"
endif

$(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/libgit2-ssh.patch-applied: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/source-extracted
Expand Down
2 changes: 1 addition & 1 deletion deps/patches/libgit2-mbedtls.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index c79b263..ee37d05 100644
ENDIF()

+IF (NOT USE_OPENSSL)
+ OPTION( USE_MBEDTLS "Link with and use mbedtls library" ON )
+ OPTION( USE_MBEDTLS "Link with and use mbedtls library" OFF )
+ENDIF()
+
# This variable will contain the libraries we need to put into
Expand Down