From 31299a74332bd20ea0f76116880dd7c93b3273d1 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Mon, 25 May 2015 07:58:24 -0700 Subject: [PATCH] Change libgit2 to a git-external note that the tarball checksums changed because of switching from /archive/ to /tarball/ url for downloading, which changes the leading folder name inside the tarball --- deps/.gitignore | 3 +- deps/Makefile | 38 +++++++++----------- deps/Versions.make | 1 - deps/checksums/libgit2-0.22.2.tar.gz/md5 | 1 - deps/checksums/libgit2-0.22.2.tar.gz/sha512 | 1 - deps/checksums/libgit2-v0.22.2.tar.gz/md5 | 1 + deps/checksums/libgit2-v0.22.2.tar.gz/sha512 | 1 + deps/libgit2.version | 2 ++ 8 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 deps/checksums/libgit2-0.22.2.tar.gz/md5 delete mode 100644 deps/checksums/libgit2-0.22.2.tar.gz/sha512 create mode 100644 deps/checksums/libgit2-v0.22.2.tar.gz/md5 create mode 100644 deps/checksums/libgit2-v0.22.2.tar.gz/sha512 create mode 100644 deps/libgit2.version diff --git a/deps/.gitignore b/deps/.gitignore index 9eeac7af247b6..abcca87d2e715 100644 --- a/deps/.gitignore +++ b/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 diff --git a/deps/Makefile b/deps/Makefile index 5a8862b1f3c2f..93534f741877e 100644 --- a/deps/Makefile +++ b/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://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 ## diff --git a/deps/Versions.make b/deps/Versions.make index 208856d0c84f0..f529654a76f4b 100644 --- a/deps/Versions.make +++ b/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 diff --git a/deps/checksums/libgit2-0.22.2.tar.gz/md5 b/deps/checksums/libgit2-0.22.2.tar.gz/md5 deleted file mode 100644 index c19aef1d41acf..0000000000000 --- a/deps/checksums/libgit2-0.22.2.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -7b21448c471dc76a3ca4801b61ac856a diff --git a/deps/checksums/libgit2-0.22.2.tar.gz/sha512 b/deps/checksums/libgit2-0.22.2.tar.gz/sha512 deleted file mode 100644 index 7c40e5a1ab8da..0000000000000 --- a/deps/checksums/libgit2-0.22.2.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -ab97a2a548fa0e9be113bfe58f6d4e97dda9d7b10b4979b5736c6d410a8f1f3fb6801d691aad246481567eecc99b6f658f7bab639076ffdf21d30561243c8eb9 diff --git a/deps/checksums/libgit2-v0.22.2.tar.gz/md5 b/deps/checksums/libgit2-v0.22.2.tar.gz/md5 new file mode 100644 index 0000000000000..3695cea1c967d --- /dev/null +++ b/deps/checksums/libgit2-v0.22.2.tar.gz/md5 @@ -0,0 +1 @@ +979fc01cad098af9df0d81866f58852c diff --git a/deps/checksums/libgit2-v0.22.2.tar.gz/sha512 b/deps/checksums/libgit2-v0.22.2.tar.gz/sha512 new file mode 100644 index 0000000000000..81b09f443dbf5 --- /dev/null +++ b/deps/checksums/libgit2-v0.22.2.tar.gz/sha512 @@ -0,0 +1 @@ +b931844871739e576f2252d7a4ba20cff3417fb8a439f527d1f0e4da13b92a5b2e3cc0741fb19d531a4c2fcf72d7650d9fc3b8a72d4245cf956bedbd4ad2db31 diff --git a/deps/libgit2.version b/deps/libgit2.version new file mode 100644 index 0000000000000..19d5237b2f6c7 --- /dev/null +++ b/deps/libgit2.version @@ -0,0 +1,2 @@ +LIBGIT2_BRANCH=v0.22.2 +LIBGIT2_SHA1=fb6df50b7f250a4fd8b2fab257f119a5185e9bf5