From 32560211b58e4a8d52996d0b9748ba9fc15dddd1 Mon Sep 17 00:00:00 2001 From: Daisuke Oyama Date: Tue, 15 Nov 2016 15:44:49 +0900 Subject: [PATCH 1/2] build: Add Homebrew include dir to `configureopts` --- deps/build.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deps/build.jl b/deps/build.jl index 2239425..a54729c 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -69,7 +69,12 @@ libsrcgmp_dir = joinpath(src_dir, "lib-src-gmp") includedirs = AbstractString[libsrc_dir, libsrcgmp_dir] targetdirs = AbstractString["lib-src-gmp/libcddgmp.la","lib-src-gmp/.libs/libcddgmp.la"] -configureopts = AbstractString["CPPFLAGS=-DGMPRATIONAL -I$(libsrc_dir) -I$(libsrcgmp_dir)"] +@static if is_apple() + homebrew_includedir = joinpath(Homebrew.brew_prefix, "include") + configureopts = AbstractString["CPPFLAGS=-DGMPRATIONAL -I$(libsrc_dir) -I$(libsrcgmp_dir) -I$(homebrew_includedir)"] +else + configureopts = AbstractString["CPPFLAGS=-DGMPRATIONAL -I$(libsrc_dir) -I$(libsrcgmp_dir)"] +end provides(BuildProcess, Dict( From 6abb05411b50e872e75b6d492b432ad598047287 Mon Sep 17 00:00:00 2001 From: Daisuke Oyama Date: Tue, 15 Nov 2016 16:09:07 +0900 Subject: [PATCH 2/2] build: Add Homebrew lib dir to `lib_dirs` --- deps/build.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/build.jl b/deps/build.jl index a54729c..4276368 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -72,8 +72,11 @@ targetdirs = AbstractString["lib-src-gmp/libcddgmp.la","lib-src-gmp/.libs/libcdd @static if is_apple() homebrew_includedir = joinpath(Homebrew.brew_prefix, "include") configureopts = AbstractString["CPPFLAGS=-DGMPRATIONAL -I$(libsrc_dir) -I$(libsrcgmp_dir) -I$(homebrew_includedir)"] + homebrew_libdir = joinpath(Homebrew.brew_prefix, "lib") + libdirs = AbstractString[homebrew_libdir] else configureopts = AbstractString["CPPFLAGS=-DGMPRATIONAL -I$(libsrc_dir) -I$(libsrcgmp_dir)"] + libdirs = AbstractString[] # What to include? end provides(BuildProcess, @@ -81,6 +84,7 @@ provides(BuildProcess, Autotools( libtarget = targetdirs, include_dirs = includedirs, + lib_dirs = libdirs, configure_options = configureopts) => libcdd)) @BinDeps.install Dict(:libcddgmp => :libcdd)