Guest User

Untitled

a guest
Feb 24th, 2018
91
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.49 KB | None | 0 0
  1. diff --git a/REQUIRE b/REQUIRE
  2. index a7c2269..597a7cf 100644
  3. --- a/REQUIRE
  4. +++ b/REQUIRE
  5. @@ -1,4 +1,3 @@
  6. julia 0.6
  7. BinDeps
  8. -@osx Homebrew
  9. Compat 0.41.0
  10. diff --git a/deps/build.jl b/deps/build.jl
  11. index e710313..713ba2f 100644
  12. --- a/deps/build.jl
  13. +++ b/deps/build.jl
  14. @@ -51,9 +51,9 @@ if need_to_build_manually
  15. # make sure we delete the old deps.jl
  16. isfile("deps.jl") && read("deps.jl", String) == systemlibs && rm("deps.jl")
  17.  
  18. - mbed = library_dependency("libmbedtls", aliases=["libmbedtls", "libmbedtls.2.1.1"])
  19. - mbed_crypto = library_dependency("libmbedcrypto", aliases=["libmbedcrypto", "libmbedcrypto.2.1.1"], validate=validate_mbed)
  20. - mbed_x509 = library_dependency("libmbedx509", aliases=["libmbedx509", "libmbedx509.2.1.1"])
  21. + mbed = library_dependency("libmbedtls", aliases=["libmbedtls", "libmbedtls.so", "libmbedtls.2.1.1"])
  22. + mbed_crypto = library_dependency("libmbedcrypto", aliases=["libmbedcrypto", "libmbedcrypto.so", "libmbedcrypto.2.1.1"], validate=validate_mbed)
  23. + mbed_x509 = library_dependency("libmbedx509", aliases=["libmbedx509", "libmbedx509.so", "libmbedx509.2.1.1"])
  24.  
  25. mbed_all = [mbed, mbed_crypto, mbed_x509]
  26.  
  27. @@ -87,11 +87,6 @@ if need_to_build_manually
  28. end
  29.  
  30. if Compat.Sys.isapple()
  31. - if Pkg.installed("Homebrew") === nothing
  32. - error("Homebrew package not installed, please run Pkg.add(\"Homebrew\")")
  33. - end
  34. - using Homebrew
  35. - provides(Homebrew.HB, "mbedtls", mbed_all)
  36. end
  37.  
  38. if Compat.Sys.iswindows()
Add Comment
Please, Sign In to add comment