From aa0217635a0f7d21a927a5022c012628f42327dc Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 11 Dec 2016 12:24:08 -0800 Subject: [PATCH 1/2] Clean up whitespace in script/update_libgit2 --- script/update_libgit2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/update_libgit2 b/script/update_libgit2 index 0f795bc1f..d84cb1de1 100755 --- a/script/update_libgit2 +++ b/script/update_libgit2 @@ -23,10 +23,10 @@ mkdir build cd build cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ - -DLIBSSH2_INCLUDE_DIRS:PATH=/usr/local/include/ \ - -DBUILD_CLAR:BOOL=OFF \ - -DTHREADSAFE:BOOL=ON \ - .. + -DLIBSSH2_INCLUDE_DIRS:PATH=/usr/local/include/ \ + -DBUILD_CLAR:BOOL=OFF \ + -DTHREADSAFE:BOOL=ON \ + .. cmake --build . product="libgit2.a" From 6adb8f8658f6818faec78f9d3747f1a42f11b4b1 Mon Sep 17 00:00:00 2001 From: Matt Rubin Date: Sun, 11 Dec 2016 12:28:13 -0800 Subject: [PATCH 2/2] Remove xctool from the script/bootstrap required tools The cibuild uses xcodebuild instead of xctool, as of https://github.com/libgit2/objective-git/commit/6f802a4b82c634f115b7f941d697ccee3f557a8b --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 84b7dd60d..1f3ea6ebb 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -10,7 +10,7 @@ config () { # A whitespace-separated list of executables that must be present and locatable. # These will each be installed through Homebrew if not found. - : ${REQUIRED_TOOLS="xctool cmake libssh2 libtool autoconf automake pkg-config"} + : ${REQUIRED_TOOLS="cmake libssh2 libtool autoconf automake pkg-config"} export REQUIRED_TOOLS }