From a13d27e9c0e1b9eb7ef1e0f5fae73a2129e65b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlosmn@github.com>
Date: Mon, 7 Jan 2019 14:02:51 +0000
Subject: [PATCH] Merge pull request #475 from lhchavez/self-contained-build

Improve the static build script

(cherry picked from commit b30b050c9c8a531c9c58b8b52c83a13b8d149caf)
---
 .gitignore                     |  1 +
 git_static.go                  |  6 +++---
 script/build-libgit2-static.sh | 15 ++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore

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