Skip to content

Commit 92d6aa2

Browse files
committed
Windows: update to libgit2 1.9.1
1 parent 17459fd commit 92d6aa2

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2.2.0
2+
- Windows: update to libgit2 1.9.1
3+
14
2.1.4
25
- Fix for libgit2 1.8.2 reverting their API change from 1.8.0
36
- New parameter 'force' in git_branch_create() see #239

src/Makevars.win

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
RWINLIB = ../.deps/libgit2
22
TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
33

4+
ifneq ($(R_COMPILED_BY),gcc 8.3.0)
5+
PCRE=-lpcre2-8
6+
endif
7+
48
PKG_CPPFLAGS = -I$(RWINLIB)/include \
59
-DR_NO_REMAP -DSTRICT_R_HEADERS
610

711
PKG_LIBS = \
812
-L$(RWINLIB)/$(TARGET) \
913
-L$(RWINLIB)/lib \
10-
-lgit2 -lssh2 -lssl -lcrypto -lz -liconv \
14+
-lgit2 -lssh2 -lssl -lcrypto $(PCRE) -lz -liconv \
1115
-lwinhttp -lws2_32 -lcrypt32 -lole32 -lrpcrt4 -lsecur32
1216

1317
all: $(SHLIB) cleanup

tools/winlibs.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
if(!file.exists('clone.o') && !file.exists("../.deps/libgit2/include/git2.h")){
22
unlink("../.deps", recursive = TRUE)
33
url <- if(grepl("aarch", R.version$platform)){
4-
"https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-clang-aarch64.tar.xz"
4+
"https://github.com/r-windows/bundles/releases/download/libgit2-1.9.1/libgit2-1.9.1-clang-aarch64.tar.xz"
55
} else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
6-
"https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-clang-x86_64.tar.xz"
6+
"https://github.com/r-windows/bundles/releases/download/libgit2-1.9.1/libgit2-1.9.1-clang-x86_64.tar.xz"
77
} else if(getRversion() >= "4.2") {
8-
"https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-ucrt-x86_64.tar.xz"
8+
"https://github.com/r-windows/bundles/releases/download/libgit2-1.9.1/libgit2-1.9.1-ucrt-x86_64.tar.xz"
99
} else {
1010
"https://github.com/rwinlib/libgit2/archive/v1.7.1.tar.gz"
1111
}

0 commit comments

Comments
 (0)