Merge pull request #11435 from JuliaLang/tk/libgit2-external

Change libgit2 to a git-external

deps/.gitignore

@@ -16,7 +16,6 @@
 /libcxx-*
 /libcxxabi-*
 /libffi-*
-/libgit*
 /llvm-*
 /lldb-*
 /mpfr-*
@@ -33,6 +32,8 @@
 /Rmath-julia*
 
 # git-externals:
+/libgit2
+/libgit2-*
 /libuv
 /libuv-*
 /openblas

deps/Makefile

@@ -1869,7 +1869,11 @@ install-virtualenv: $(VIRTUALENV_TARGET)
 
 ## libgit2
 
-LIBGIT2_OBJ_SOURCE = libgit2-$(LIBGIT2_VER)/build/libgit2.$(SHLIB_EXT)
+LIBGIT2_GIT_URL = git:https://github.com/libgit2/libgit2.git
+LIBGIT2_TAR_URL = https://api.github.com/repos/libgit2/libgit2/tarball/$1
+$(eval $(call git-external,libgit2,LIBGIT2,CMakeLists.txt,build/libgit2.$(SHLIB_EXT)))
+
+LIBGIT2_OBJ_SOURCE = $(LIBGIT2_SRC_DIR)/build/libgit2.$(SHLIB_EXT)
 LIBGIT2_OBJ_TARGET = $(build_shlibdir)/libgit2.$(SHLIB_EXT)
 
 LIBGIT2_OPTS = $(CMAKE_COMMON) -DTHREADSAFE=ON
@@ -1883,28 +1887,22 @@ LIBGIT2_OPTS += -DCMAKE_FIND_ROOT_PATH=/usr/$(XC_HOST) -DCMAKE_FIND_ROOT_PATH_MO
 endif
 endif
 
-libgit2-$(LIBGIT2_VER).tar.gz:
- $(JLDOWNLOAD) $@ https://github.com/libgit2/libgit2/archive/v$(LIBGIT2_VER).tar.gz
-libgit2-$(LIBGIT2_VER)/CMakeLists.txt: libgit2-$(LIBGIT2_VER).tar.gz
- $(JLCHECKSUM) $<
- $(TAR) zxf $<
- touch -c $@
-libgit2-$(LIBGIT2_VER)/build/Makefile: libgit2-$(LIBGIT2_VER)/CMakeLists.txt
- mkdir -p libgit2-$(LIBGIT2_VER)/build
- cd libgit2-$(LIBGIT2_VER)/build/ && \
+$(LIBGIT2_SRC_DIR)/build/Makefile: $(LIBGIT2_SRC_DIR)/CMakeLists.txt
+ mkdir -p $(LIBGIT2_SRC_DIR)/build
+ cd $(LIBGIT2_SRC_DIR)/build/ && \
  $(CMAKE) .. $(LIBGIT2_OPTS)
  touch -c $@
-$(LIBGIT2_OBJ_SOURCE): libgit2-$(LIBGIT2_VER)/build/Makefile
- $(MAKE) -C libgit2-$(LIBGIT2_VER)/build
+$(LIBGIT2_OBJ_SOURCE): $(LIBGIT2_SRC_DIR)/build/Makefile
+ $(MAKE) -C $(LIBGIT2_SRC_DIR)/build
  touch -c $@
-libgit2-$(LIBGIT2_VER)/build/checked: $(LIBGIT2_OBJ_SOURCE)
+$(LIBGIT2_SRC_DIR)/build/checked: $(LIBGIT2_OBJ_SOURCE)
 ifeq ($(OS),$(BUILD_OS))
- $(MAKE) -C libgit2-$(LIBGIT2_VER)/build test
+ $(MAKE) -C $(LIBGIT2_SRC_DIR)/build test
 endif
  echo 1 > $@
 $(LIBGIT2_OBJ_TARGET): $(LIBGIT2_OBJ_SOURCE) | $(build_shlibdir)
  cp $< $@
- #$$(call make-install,libgit2-$(LIBGIT2_VER)/build,)
+ #$$(call make-install,$(LIBGIT2_SRC_DIR)/build,)
 ifeq ($(OS),Linux)
  # If we're on linux, copy over libssl and libcrypto for libgit2
  -LIBGIT_LIBS=$$(ldd "$@" | tail -n +2 | awk '{print $$(NF-1)}'); \
@@ -1917,15 +1915,13 @@ endif
  touch -c $@
 
 clean-libgit2:
- -rm -rf libgit2-$(LIBGIT2_VER)/build/
+ -rm -rf $(LIBGIT2_SRC_DIR)/build/
  -rm -f $(LIBGIT2_OBJ_TARGET)
-distclean-libgit2:
- -rm -rf libgit2-$(LIBGIT2_VER).tar.gz libgit2-$(LIBGIT2_VER).zip libgit2-$(LIBGIT2_VER)
 
-get-libgit2: libgit2-$(LIBGIT2_VER).tar.gz
-configure-libgit2: libgit2-$(LIBGIT2_VER)/build/Makefile
+get-libgit2: $(LIBGIT2_SRC_DIR)/CMakeLists.txt
+configure-libgit2: $(LIBGIT2_SRC_DIR)/build/Makefile
 compile-libgit2: $(LIBGIT2_OBJ_SOURCE)
-check-libgit2: libgit2-$(LIBGIT2_VER)/build/checked
+check-libgit2: $(LIBGIT2_SRC_DIR)/build/checked
 install-libgit2: $(LIBGIT2_OBJ_TARGET)
 
 ## phony targets ##

deps/Versions.make

@@ -13,5 +13,4 @@ MPFR_VER=3.1.2
 PATCHELF_VER = 0.8
 GIT_VER = 1.8.5.6
 VIRTUALENV_VER = 1.11.6
-LIBGIT2_VER = 0.22.2
 RMATH_JULIA_VER = 0.1

deps/checksums/libgit2-v0.22.2.tar.gz/md5

@@ -0,0 +1 @@
+979fc01cad098af9df0d81866f58852c

deps/checksums/libgit2-v0.22.2.tar.gz/sha512

@@ -0,0 +1 @@
+b931844871739e576f2252d7a4ba20cff3417fb8a439f527d1f0e4da13b92a5b2e3cc0741fb19d531a4c2fcf72d7650d9fc3b8a72d4245cf956bedbd4ad2db31

deps/libgit2.version

@@ -0,0 +1,2 @@
+LIBGIT2_BRANCH=v0.22.2
+LIBGIT2_SHA1=fb6df50b7f250a4fd8b2fab257f119a5185e9bf5