Skip to content

Commit

Permalink
Merge pull request #349 from oxinabox/ox/pushfront
Browse files Browse the repository at this point in the history
pushfirst! not pushfront! 0.6 (closes #347)
  • Loading branch information
aviks authored Jan 14, 2018
2 parents 708a180 + 0205f02 commit a016a93
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/dependencies.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ if !isdefined(Base, :pairs)
pairs(x) = (a => b for (a, b) in x)
end


# A dependency provider, if successfully executed will satisfy the dependency
abstract type DependencyProvider end

Expand Down Expand Up @@ -612,10 +613,10 @@ function generate_steps(dep::LibraryDependency, h::Autotools, provider_opts)
opts[:srcdir] = joinpath(opts[:srcdir],opts[:configure_subdir])
delete!(opts, :configure_subdir)
end
pushfront!(opts[:include_dirs],includedir(dep))
pushfront!(opts[:lib_dirs],libdir(dep))
pushfront!(opts[:rpath_dirs],libdir(dep))
pushfront!(opts[:pkg_config_dirs],joinpath(libdir(dep),"pkgconfig"))
pushfirst!(opts[:include_dirs],includedir(dep))
pushfirst!(opts[:lib_dirs],libdir(dep))
pushfirst!(opts[:rpath_dirs],libdir(dep))
pushfirst!(opts[:pkg_config_dirs],joinpath(libdir(dep),"pkgconfig"))
env = Dict{String,String}()
env["PKG_CONFIG_PATH"] = join(opts[:pkg_config_dirs],":")
delete!(opts,:pkg_config_dirs)
Expand Down Expand Up @@ -649,7 +650,7 @@ function _find_library(dep::LibraryDependency; provider = Any)

# Allow user to override installation path
if haskey(opts,:installed_libpath) && isdir(opts[:installed_libpath])
pushfront!(paths,opts[:installed_libpath])
pushfirst!(paths,opts[:installed_libpath])
end

ppaths = libdir(p,dep)
Expand Down
1 change: 1 addition & 0 deletions test/REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Cairo
HttpParser
GSL
Gumbo
6 changes: 6 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ using HttpParser
Pkg.build("GSL")
using GSL


Pkg.build("Gumbo") # Test Autotools code paths
using Gumbo



# PR 171
@test BinDeps.lower(nothing, nothing) === nothing

Expand Down

0 comments on commit a016a93

Please sign in to comment.