Skip to content
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

Bump libgit2, document libssl-dev build dep and fail earlier when missing #13448

Merged
merged 3 commits into from
Oct 6, 2015
Merged

Bump libgit2, document libssl-dev build dep and fail earlier when missing #13448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9b443c
Bump libgit2 to 0.23.2
tkelman Oct 5, 2015
ad3ebba
Fail libgit2 configuration if openssl not found on Linux
tkelman Oct 5, 2015
218ac58
Document libssl-dev build dependency
tkelman Oct 5, 2015
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ Building Julia requires that the following software be installed:
- **[m4]** — needed to build GMP.
- **[patch]** — for modifying source code.
- **[cmake]** — needed to build `libgit2`.
- **[openssl]** — needed for HTTPS support in `libgit2` on Linux, install via `apt-get install libssl-dev` or `yum install openssl-devel`.

Julia uses the following external libraries, which are automatically downloaded (or in a few cases, included in the Julia source repository) and then compiled from source the first time you run `make`:

Expand Down Expand Up @@ -317,6 +318,7 @@ For a longer overview of Julia's dependencies, see these [slides](https://github
[libosxunwind]: https://github.com/JuliaLang/libosxunwind
[libunwind]: http://www.nongnu.org/libunwind
[Rmath-julia]: https://github.com/JuliaLang/Rmath-julia
[openssl]: https://www.openssl.org

<a name="System-Provided-Libraries">
### System Provided Libraries
Expand Down
3 changes: 3 additions & 0 deletions deps/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2026,9 +2026,12 @@ else
LIBGIT2_OPTS += -DBUILD_CLAR=OFF -DCMAKE_RC_COMPILER=`which $(CROSS_COMPILE)windres` -DDLLTOOL=`which $(CROSS_COMPILE)dlltool`
LIBGIT2_OPTS += -DCMAKE_FIND_ROOT_PATH=/usr/$(XC_HOST) -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
endif
else ifneq ($(OS), Darwin)
LIBGIT2_OPTS += -DREQUIRE_OPENSSL=ON
endif

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/CMakeLists.txt
-cd $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR) && patch -p1 -f < $(SRCDIR)/libgit2-require-openssl.patch
mkdir -p $(dir $@)
cd $(dir $@) && \
$(CMAKE) $(dir $<) $(LIBGIT2_OPTS)
Expand Down
1 change: 1 addition & 0 deletions deps/checksums/libgit2-2de198b4cec26c2b54c06da4baf88b3f57b9ca86.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c78031212e56b80b3b9c6e06990d2396
1 change: 1 addition & 0 deletions deps/checksums/libgit2-2de198b4cec26c2b54c06da4baf88b3f57b9ca86.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8a716e16145cfe9319fdb812f754a473096d643e38f67887301d6a90c25d0b888f367e3e80f8eac6396a908e654ad333cd19455eaec9f6d489dfa167982f7558
1 change: 0 additions & 1 deletion deps/checksums/libgit2-f6dedf2c2eb806e2a6fdd4cf31f68386efc2ee0b.tar.gz/md5
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/libgit2-f6dedf2c2eb806e2a6fdd4cf31f68386efc2ee0b.tar.gz/sha512
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions deps/libgit2-require-openssl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73c9630..3dedd0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,7 @@ ELSE ()
ENDIF ()

IF (NOT AMIGA AND USE_OPENSSL)
- FIND_PACKAGE(OpenSSL)
+ FIND_PACKAGE(OpenSSL REQUIRED)
ENDIF ()

IF (CURL_FOUND)
4 changes: 2 additions & 2 deletions deps/libgit2.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIBGIT2_BRANCH=v0.23.1
LIBGIT2_SHA1=f6dedf2c2eb806e2a6fdd4cf31f68386efc2ee0b
LIBGIT2_BRANCH=v0.23.2
LIBGIT2_SHA1=2de198b4cec26c2b54c06da4baf88b3f57b9ca86