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.

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

temporary: patch segfault on mac #274

Merged
merged 2 commits into from
Apr 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 4 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
matrix:
include:
# - language: julia
# julia: 0.6
# os: linux
# dist: trusty
# sudo: false
# - language: julia
# julia: 0.7
# os: linux
# dist: trusty
# sudo: false
# - language: julia
# julia: 1.0
# os: linux
# dist: trusty
# sudo: false
- language: julia
julia: 0.6
os: linux
Expand All @@ -28,17 +13,16 @@ matrix:
julia: nightly
os: linux

- language: julia
julia: 0.6
os: osx
- language: julia
julia: 0.7
os: osx
- language: julia
julia: 1.0
os: osx
allow_failures:
- julia: 1.0
- language: julia
julia: 1.1
os: osx

notifications:
email: false
after_success:
Expand Down
17 changes: 17 additions & 0 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ using Compat
import Compat.Libdl
import Compat.Sys

if Sys.isapple()
deps_file_str = open(joinpath(dirname(pathof(BinDeps)), "dependencies.jl")) do file
read(file, String)
end
if occursin("ZEval",pathof(BinDeps))
patched_dlclose = replace(deps_file_str, "Libdl.dlclose(h)" => "println(\"ignored: dlclose()\")")
include_string(BinDeps,patched_dlclose)
end
end


@BinDeps.setup

# check for cairo version
Expand Down Expand Up @@ -166,3 +177,9 @@ provides(BuildProcess,
(:cairo, :_jl_libcairo),
(:pango, :_jl_libpango),
(:pangocairo, :_jl_libpangocairo)])


if Sys.isapple()
import Pkg.Types.printpkgstyle
printpkgstyle(stdout, :Installed, "Patched install script, restarting Julia is recommended.")
end