-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
libgit2: Upgrade to
v0.27.2
, carry further patches for mbedTLS inte…
…gration
- Loading branch information
1 parent
1a4161f
commit d9b1bd3
Showing
5 changed files
with
50 additions
and
3 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
deps/checksums/libgit2-8d36dc62ba1b5d7deb66b6f982e005ddbc2ce343.tar.gz/md5
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
4abe229ab2a6f6cf3d3ae4ae317a03ce |
1 change: 1 addition & 0 deletions
1
deps/checksums/libgit2-8d36dc62ba1b5d7deb66b6f982e005ddbc2ce343.tar.gz/sha512
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
35e8586583442b71d3b8310aa2d349d7093415347c20054a7f453676735008c6d7f163d41486df038e99694f9a11c8ea17b5a6266a936c206b9418f895b3faf5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LIBGIT2_BRANCH=v0.26.0 | ||
LIBGIT2_SHA1=15e119375018fba121cf58e02a9f17fe22df0df8 | ||
LIBGIT2_BRANCH=v0.27.2 | ||
LIBGIT2_SHA1=8d36dc62ba1b5d7deb66b6f982e005ddbc2ce343 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
diff --git a/.travis.yml b/.travis.yml | ||
index 686041bfa..61edba135 100644 | ||
--- a/.travis.yml | ||
+++ b/.travis.yml | ||
@@ -58,12 +58,12 @@ matrix: | ||
- compiler: gcc | ||
env: | ||
MBEDTLS=1 | ||
- OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DUSE_HTTPS=mbedTLS -DMBEDTLS_ROOT_DIR=../deps/mbedtls" | ||
+ OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -DMBEDTLS_ROOT_DIR=../deps/mbedtls" | ||
os: linux | ||
- compiler: gcc | ||
env: | ||
MBEDTLS=1 | ||
- OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DUSE_HTTPS=mbedTLS -DMBEDTLS_ROOT_DIR=../deps/mbedtls" | ||
+ OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -DMBEDTLS_ROOT_DIR=../deps/mbedtls" | ||
os: linux | ||
allow_failures: | ||
- env: COVERITY=1 | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 2b82bb325..2deed5f87 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -284,8 +284,13 @@ ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto") | ||
ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS") | ||
ADD_FEATURE_INFO(SHA ON "using mbedTLS") | ||
SET(GIT_SHA1_MBEDTLS 1) | ||
- FILE(GLOB SRC_SHA1 src/hash/hash_mbedtls.c) | ||
- LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls") | ||
+ FILE(GLOB SRC_SHA1 hash/hash_mbedtls.c) | ||
+ LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR}) | ||
+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES}) | ||
+ # mbedTLS has no pkgconfig file, hence we can't require it | ||
+ # https://github.com/ARMmbed/mbedtls/issues/228 | ||
+ # For now, pass its link flags as our own | ||
+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES}) | ||
ELSE() | ||
MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}") | ||
ENDIF() |