From 61be5518f76a6b6edfea901716d3e314842a8969 Mon Sep 17 00:00:00 2001 From: Lyndon White <oxinabox@ucc.asn.au> Date: Sun, 14 Jan 2018 16:34:51 +0800 Subject: [PATCH 1/3] =add tests showing #347 --- test/REQUIRE | 1 + test/runtests.jl | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/test/REQUIRE b/test/REQUIRE index b00f9a4..43ccc1d 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -1,3 +1,4 @@ Cairo HttpParser GSL +Gumbo diff --git a/test/runtests.jl b/test/runtests.jl index b239e99..ed0c312 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -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 From c10c61a3610ef4a4bc8f16c08a29e87515d1bd15 Mon Sep 17 00:00:00 2001 From: Lyndon White <oxinabox@ucc.asn.au> Date: Sun, 14 Jan 2018 16:39:33 +0800 Subject: [PATCH 2/3] =add pushfront!=ushift on 0.6 closes #347 --- src/dependencies.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dependencies.jl b/src/dependencies.jl index 0968c0e..a217bc4 100644 --- a/src/dependencies.jl +++ b/src/dependencies.jl @@ -6,6 +6,10 @@ if !isdefined(Base, :pairs) pairs(x) = (a => b for (a, b) in x) end +if !isdefined(base, :pushfront!) + pushfront!(xs, x) = unshift!(xs, x) +end + # A dependency provider, if successfully executed will satisfy the dependency abstract type DependencyProvider end From 0205f02af4a9595a707775ed046f00eb8e45c13d Mon Sep 17 00:00:00 2001 From: Lyndon White <oxinabox@ucc.asn.au> Date: Sun, 14 Jan 2018 17:36:20 +0800 Subject: [PATCH 3/3] =pushfirst! not pushfront! --- src/dependencies.jl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/dependencies.jl b/src/dependencies.jl index a217bc4..6efea37 100644 --- a/src/dependencies.jl +++ b/src/dependencies.jl @@ -6,9 +6,6 @@ if !isdefined(Base, :pairs) pairs(x) = (a => b for (a, b) in x) end -if !isdefined(base, :pushfront!) - pushfront!(xs, x) = unshift!(xs, x) -end # A dependency provider, if successfully executed will satisfy the dependency abstract type DependencyProvider end @@ -616,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) @@ -653,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)