Skip to content

Commit 2e2e4f6

Browse files
committed
Merge pull request #9761 from JuliaLang/sf/bundlelibssl
Bundle libssl and libcrypto on Linux
2 parents d98e9f5 + 3e81935 commit 2e2e4f6

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ release-candidate: release test
8686

8787
@echo 1. Remove deprecations in base/deprecated.jl
8888
@echo 2. Bump VERSION
89-
@echo 3. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)"
90-
@echo 4. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work
89+
@echo 3. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)" #"` # These comments deal with incompetent syntax highlighting rules
90+
@echo 4. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work #"`
9191
@echo 5. Replace github release tarball with tarball created from make source-dist
9292
@echo 6. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms
9393
@echo 7. Upload to AWS, update http://julialang.org/downloads and http://status.julialang.org/stable links

deps/Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -1801,6 +1801,15 @@ endif
18011801
echo 1 > $@
18021802
$(LIBGIT2_OBJ_TARGET): $(LIBGIT2_OBJ_SOURCE) | $(build_shlibdir)
18031803
cp $< $@
1804+
ifeq ($(OS),Linux)
1805+
# If we're on linux, copy over libssl and libcrypto for libgit2
1806+
-LIBGIT_LIBS=$$(ldd "$@" | tail -n +2 | awk '{print $$(NF-1)}'); \
1807+
for LIB in libssl libcrypto; do \
1808+
LIB_PATH=$$(echo "$$LIBGIT_LIBS" | grep "$$LIB"); \
1809+
echo "LIB_PATH for $$LIB: $$LIB_PATH"; \
1810+
[ ! -z "$$LIB_PATH" ] && cp -v "$$LIB_PATH" $(build_shlibdir); \
1811+
done
1812+
endif
18041813

18051814
clean-libgit2:
18061815
-rm -rf libgit2-$(LIBGIT2_VER)/build/

0 commit comments

Comments
 (0)