Skip to content

Commit b30b050

Browse files
authored
Merge pull request libgit2#475 from lhchavez/self-contained-build
Improve the static build script
2 parents e93f34c + f3c4879 commit b30b050

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/static-build/

git_static.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package git
44

55
/*
6-
#cgo windows CFLAGS: -I${SRCDIR}/vendor/libgit2/include
7-
#cgo windows LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -lwinhttp
8-
#cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
6+
#cgo windows CFLAGS: -I${SRCDIR}/static-build/install/include/
7+
#cgo windows LDFLAGS: -L${SRCDIR}/static-build/install/lib/ -lgit2 -lwinhttp
8+
#cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc
99
#include <git2.h>
1010
1111
#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 27

script/build-libgit2-static.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
set -ex
44

5-
VENDORED_PATH=vendor/libgit2
5+
ROOT="$(cd "$0/../.." && echo "${PWD}")"
6+
BUILD_PATH="${ROOT}/static-build"
7+
VENDORED_PATH="${ROOT}/vendor/libgit2"
68

7-
cd $VENDORED_PATH &&
8-
mkdir -p install/lib &&
9-
mkdir -p build &&
10-
cd build &&
9+
mkdir -p "${BUILD_PATH}/build" "${BUILD_PATH}/install/lib"
10+
11+
cd "${BUILD_PATH}/build" &&
1112
cmake -DTHREADSAFE=ON \
1213
-DBUILD_CLAR=OFF \
1314
-DBUILD_SHARED_LIBS=OFF \
1415
-DCMAKE_C_FLAGS=-fPIC \
1516
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
16-
-DCMAKE_INSTALL_PREFIX=../install \
17-
.. &&
17+
-DCMAKE_INSTALL_PREFIX="${BUILD_PATH}/install" \
18+
"${VENDORED_PATH}" &&
1819

1920
cmake --build . --target install

0 commit comments

Comments
 (0)