From b3256d9058aa93176190cb69f73afb72f0730100 Mon Sep 17 00:00:00 2001
From: Ryan Graham <r.m.graham@gmail.com>
Date: Tue, 8 May 2018 15:47:34 -0700
Subject: static: use pkg-config exclusively when using it

When using the static linking option on platforms that use pkg-config,
use ONLY pkg-config to get the CFLAGS and LDFLAGS. This prevents pulling
in dependencies and flags for any non-vendored version that may be
present on the host.

The main practical effect of this is that if someone doesn't need/want
any sort of remote access support at all they can completely disable
libcurl, libssh2, libssl, etc and produce a smaller/simpler binary and
greatly simplify their build-time dependencies. When done properly, the
generated pkg-config file will tell cgo everything it needs to know.

This also prevents confusion if there is a system copy of libgit2 that
is being given priority over the vendored build.

Signed-off-by: Ryan Graham <r.m.graham@gmail.com>
---
 script/build-libgit2-static.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'script/build-libgit2-static.sh')

diff --git a/script/build-libgit2-static.sh b/script/build-libgit2-static.sh
index 5723721..1568ece 100755
--- a/script/build-libgit2-static.sh
+++ b/script/build-libgit2-static.sh
@@ -16,4 +16,4 @@ cmake -DTHREADSAFE=ON \
       -DCMAKE_INSTALL_PREFIX=../install \
       .. &&
 
-cmake --build .
+cmake --build . --target install
-- 
cgit v1.2.3


From f3c487966d53ad78e25d2e6750414009f5606dbb Mon Sep 17 00:00:00 2001
From: lhchavez <lhchavez@lhchavez.com>
Date: Sat, 5 Jan 2019 20:13:01 +0000
Subject: Improve the static build script

This change:

* Uses the installed version of both the library and the pkgconfig file,
  which fixes path resolution on Ubuntu Xenial.
* Uses quoting liberally so that paths with spaces in them are correctly
  handled.
* Moves the build+install directories to static-build/ in the git2go
  repository to avoid having a dirty vendor/libgit2 checkout.
---
 .gitignore                     |  1 +
 git_static.go                  |  6 +++---
 script/build-libgit2-static.sh | 15 ++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore

(limited to 'script/build-libgit2-static.sh')

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..edc18d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/static-build/
diff --git a/git_static.go b/git_static.go
index 243669f..547ae8a 100644
--- a/git_static.go
+++ b/git_static.go
@@ -3,9 +3,9 @@
 package git
 
 /*
-#cgo windows CFLAGS: -I${SRCDIR}/vendor/libgit2/include
-#cgo windows LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -lwinhttp
-#cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
+#cgo windows CFLAGS: -I${SRCDIR}/static-build/install/include/
+#cgo windows LDFLAGS: -L${SRCDIR}/static-build/install/lib/ -lgit2 -lwinhttp
+#cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc
 #include <git2.h>
 
 #if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 27
diff --git a/script/build-libgit2-static.sh b/script/build-libgit2-static.sh
index 1568ece..680dd93 100755
--- a/script/build-libgit2-static.sh
+++ b/script/build-libgit2-static.sh
@@ -2,18 +2,19 @@
 
 set -ex
 
-VENDORED_PATH=vendor/libgit2
+ROOT="$(cd "$0/../.." && echo "${PWD}")"
+BUILD_PATH="${ROOT}/static-build"
+VENDORED_PATH="${ROOT}/vendor/libgit2"
 
-cd $VENDORED_PATH &&
-mkdir -p install/lib &&
-mkdir -p build &&
-cd build &&
+mkdir -p "${BUILD_PATH}/build" "${BUILD_PATH}/install/lib"
+
+cd "${BUILD_PATH}/build" &&
 cmake -DTHREADSAFE=ON \
       -DBUILD_CLAR=OFF \
       -DBUILD_SHARED_LIBS=OFF \
       -DCMAKE_C_FLAGS=-fPIC \
       -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-      -DCMAKE_INSTALL_PREFIX=../install \
-      .. &&
+      -DCMAKE_INSTALL_PREFIX="${BUILD_PATH}/install" \
+      "${VENDORED_PATH}" &&
 
 cmake --build . --target install
-- 
cgit v1.2.3