From c9a7e84e5be3d60214f2a9db02a851ed10263b22 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 5 Jan 2025 01:21:58 -0600 Subject: [PATCH] try build against 1.8.x Signed-off-by: Jeff Carr --- Build_system_dynamic.go | 4 +++- Makefile | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Build_system_dynamic.go b/Build_system_dynamic.go index 646bf24..6a5fae0 100644 --- a/Build_system_dynamic.go +++ b/Build_system_dynamic.go @@ -5,8 +5,10 @@ package git /* #cgo pkg-config: libgit2 -#cgo CFLAGS: -DLIBGIT2_DYNAMIC +#cgo CFLAGS: -DLIBGIT2_DYNAMIC -I/opt/libgit2/include +#cgo LDFLAGS: -L/opt/libgit2 -lgit2 #include + */ import "C" diff --git a/Makefile b/Makefile index ed3d90c..2c70ebc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ TEST_ARGS ?= --count=1 +PKG_CONFIG_PATH=/opt/libgit2/ + default: goimports test goimports: @@ -12,9 +14,12 @@ generate: static-build/install/lib/libgit2.a # ============== # This uses whatever version of libgit2 can be found in the system. test: - go-mod-clean # go install go.wit.com/apps/go-mod-clean@latest + -go-mod-clean # go install go.wit.com/apps/go-mod-clean@latest go run script/check-MakeGitError-thread-lock.go - go test $(TEST_ARGS) ./... + PKG_CONFIG_PATH=/opt/libgit2/ go test -v -x $(TEST_ARGS) ./... + +add-remote: + git remote add git2go https://github.com/libgit2/git2go.git install: go install ./...