Skip to content

Improve libgit2 build reliability #97

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

Open
hbmartin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve libgit2 build reliability #97

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
7 changes: 7 additions & 0 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,9 +1390,12 @@
files = (
);
inputPaths = (
"$(SRCROOT)/script/update_libgit2",
"$(SRCROOT)/External/libgit2/CMakeLists.txt",
);
name = libgit2;
outputPaths = (
"$(SRCROOT)/External/libgit2.a",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -1743,6 +1746,7 @@
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
ENABLE_TESTABILITY = YES;
EXCLUDED_ARCHS = x86_64;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand Down Expand Up @@ -1783,6 +1787,7 @@
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
EXCLUDED_ARCHS = x86_64;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand Down Expand Up @@ -1918,6 +1923,7 @@
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
EXCLUDED_ARCHS = x86_64;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand Down Expand Up @@ -2136,6 +2142,7 @@
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
EXCLUDED_ARCHS = x86_64;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand Down
11 changes: 10 additions & 1 deletion script/update_libgit2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

set -e

product="External/libgit2.a"
newer_source=$(find External/libgit2 \
\( -path 'External/libgit2/.git' -o -path 'External/libgit2/build' \) -prune -o \
-type f -newer "$product" -print -quit 2>/dev/null || true)
if [ -f "$product" ] && [ -z "$newer_source" ]; then
echo "libgit2 is up to date."
exit 0
fi

cd "External/libgit2"

if [ -d "build" ]; then
Expand All @@ -12,7 +21,7 @@ mkdir build
cd build

# OpenSSL is keg-only, so add its pkgconfig location manually
if [[ $(uname -m) == 'arm64' ]]; then
if [ "$(uname -m)" = 'arm64' ]; then
echo "Running on a Apple Silicon M1"
export ARCH_PREFIX=/opt/homebrew
else
Expand Down