update libgit2 to 0.25rc1

OpenSmalltalk · Nov 24, 2016 · 45a7861 · 45a7861
1 parent 41aad25
commit 45a7861
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/build.macos32x86/third-party/libgit2/Makefile.lib b/build.macos32x86/third-party/libgit2/Makefile.lib
@@ -7,7 +7,7 @@ LIBGIT2URL:=https://github.com/libgit2/libgit2/archive/v0.25.0-rc1.tar.gz
 LIBGIT2DIR:=$(THIRDPARTYDIR)/libgit2-0.25.0-rc1
 LIBGIT2LIBNAME:=libgit2.0.25.0.dylib
 LIBGIT2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBGIT2LIBNAME)
-LIBGIT2ARCHIVE:=$(THIRDPARTYCACHEDIR)/libgit2-v0.25.0-rc1.tar.gz
+LIBGIT2ARCHIVE:=$(THIRDPARTYCACHEDIR)/libgit2-v0.25.0.tar.gz
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
@@ -23,12 +23,13 @@ $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 		&& cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DUSE_SSH=ON \
-			-DBUILD_CLAR=OFF \
+			-DCURL=OFF \
+			-DBUILD_CLAR=ON \
 			-DLIBSSH2_FOUND=ON \
 			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
 			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.1.dylib \
-			-DCMAKE_C_FLAGS=-m32 \
-			-DCMAKE_CXX_FLAGS=-m32 \
+			-DCMAKE_C_FLAGS="-m32 -L$(THIRDPARTYLIBDIR)" \
+			-DCMAKE_CXX_FLAGS="-m32 -L$(THIRDPARTYLIBDIR)" \
 			-DCMAKE_OSX_ARCHITECTURES=i386 \
 			-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,@executable_path:@executable_path/Plugins \
 		&& make \