diff options
| author | lhchavez <[email protected]> | 2020-02-23 23:05:40 +0000 |
|---|---|---|
| committer | lhchavez <[email protected]> | 2020-03-04 09:54:42 -0800 |
| commit | e10c2eeef23d05e0ce12061bb535132f37e6d457 (patch) | |
| tree | a236ecbc6caeb447897d779921f4b86bde2e6476 | |
| parent | 30de4b2e26a2eb7742445962e3038052c5376bfa (diff) | |
Uprev vendor/libgit2 to v0.99
This uprevs libgit2 to the latest and greatest.
| -rw-r--r-- | git_dynamic.go | 4 | ||||
| -rw-r--r-- | git_static.go | 4 | ||||
| -rwxr-xr-x | script/build-libgit2.sh | 2 | ||||
| m--------- | vendor/libgit2 | 0 |
4 files changed, 6 insertions, 4 deletions
diff --git a/git_dynamic.go b/git_dynamic.go index 06deeeb..9112954 100644 --- a/git_dynamic.go +++ b/git_dynamic.go @@ -6,8 +6,8 @@ package git #include <git2.h> #cgo pkg-config: libgit2 -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 28 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.28" +#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 99 +# error "Invalid libgit2 version; this git2go supports libgit2 v0.99" #endif */ diff --git a/git_static.go b/git_static.go index d7c2295..4dcb1db 100644 --- a/git_static.go +++ b/git_static.go @@ -8,8 +8,8 @@ package git #cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc #include <git2.h> -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 28 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.28" +#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 99 +# error "Invalid libgit2 version; this git2go supports libgit2 v0.99" #endif */ diff --git a/script/build-libgit2.sh b/script/build-libgit2.sh index acbc84a..839b8f3 100755 --- a/script/build-libgit2.sh +++ b/script/build-libgit2.sh @@ -41,6 +41,8 @@ cmake -DTHREADSAFE=ON \ -DCMAKE_C_FLAGS=-fPIC \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_INSTALL_PREFIX="${BUILD_PATH}/install" \ + -DINCLUDE_INSTALL_DIR="${BUILD_PATH}/install/include" \ + -DLIB_INSTALL_DIR="${BUILD_PATH}/install/lib" \ "${VENDORED_PATH}" && exec cmake --build . --target install diff --git a/vendor/libgit2 b/vendor/libgit2 -Subproject ee3307a183e39d602b25fa94831c6fc09e7c1b6 +Subproject 172239021f7ba04fe7327647b213799853a9eb8 |