Skip to content

Windows: update to libgit2 1.9.1 #249

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
jeroen merged 1 commit into from
Sep 5, 2025
Merged

Windows: update to libgit2 1.9.1 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2.2.0
- Windows: update to libgit2 1.9.1

2.1.4
- Fix for libgit2 1.8.2 reverting their API change from 1.8.0
- New parameter 'force' in git_branch_create() see #239
Expand Down
6 changes: 5 additions & 1 deletion src/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
RWINLIB = ../.deps/libgit2
TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)

ifneq ($(R_COMPILED_BY),gcc 8.3.0)
PCRE=-lpcre2-8
endif

PKG_CPPFLAGS = -I$(RWINLIB)/include \
-DR_NO_REMAP -DSTRICT_R_HEADERS

PKG_LIBS = \
-L$(RWINLIB)/$(TARGET) \
-L$(RWINLIB)/lib \
-lgit2 -lssh2 -lssl -lcrypto -lz -liconv \
-lgit2 -lssh2 -lssl -lcrypto $(PCRE) -lz -liconv \
-lwinhttp -lws2_32 -lcrypt32 -lole32 -lrpcrt4 -lsecur32

all: $(SHLIB) cleanup
Expand Down
6 changes: 3 additions & 3 deletions tools/winlibs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
if(!file.exists('clone.o') && !file.exists("../.deps/libgit2/include/git2.h")){
unlink("../.deps", recursive = TRUE)
url <- if(grepl("aarch", R.version$platform)){
"https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-clang-aarch64.tar.xz"
"https://github.com/r-windows/bundles/releases/download/libgit2-1.9.1/libgit2-1.9.1-clang-aarch64.tar.xz"
} else if(grepl("clang", Sys.getenv('R_COMPILED_BY'))){
"https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-clang-x86_64.tar.xz"
"https://github.com/r-windows/bundles/releases/download/libgit2-1.9.1/libgit2-1.9.1-clang-x86_64.tar.xz"
} else if(getRversion() >= "4.2") {
"https://github.com/r-windows/bundles/releases/download/libgit2-1.7.2/libgit2-1.7.2-ucrt-x86_64.tar.xz"
"https://github.com/r-windows/bundles/releases/download/libgit2-1.9.1/libgit2-1.9.1-ucrt-x86_64.tar.xz"
} else {
"https://github.com/rwinlib/libgit2/archive/v1.7.1.tar.gz"
}
Expand Down
Loading