Skip to content
This repository was archived by the owner on Dec 14, 2020. It is now read-only.

WIP: Upgrade OS to 2.10.0 #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Upgrade OS to 2.10.0 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cf2ec5
Upgrade OS to 2.10.0
tkelman Jul 23, 2015
cd3391b
Add a patch for Ipopt initial conditions
tkelman Jul 23, 2015
dec8598
Fix pipe deprecation
tkelman Oct 17, 2015
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
17 changes: 9 additions & 8 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using BinDeps
using BinDeps, Compat

@BinDeps.setup

libOS = library_dependency("libOS", aliases=["libOS-6"])
version = "2.9.2"
version = "2.10.0"

provides(Sources, URI("http://www.coin-or.org/download/source/OS/OS-$version.tgz"),
[libOS], os = :Unix)
Expand Down Expand Up @@ -35,8 +35,8 @@ patchdir = BinDeps.depsdir(libOS)
builddir = joinpath(BinDeps.depsdir(libOS), "src", "OS-$version", "build")

ENV2 = copy(ENV)
@unix_only ENV2["PKG_CONFIG_PATH"] = joinpath(cbclibdir, "pkgconfig") *
":" * joinpath(ipoptlibdir, "pkgconfig")
@unix_only ENV2["PKG_CONFIG_PATH"] = string(joinpath(cbclibdir, "pkgconfig"),
":", joinpath(ipoptlibdir, "pkgconfig"))
cbcincdir = joinpath(cbclibdir, "..", "include", "coin")

provides(SimpleBuild,
Expand All @@ -45,9 +45,10 @@ provides(SimpleBuild,
CreateDirectory(builddir, true)
@build_steps begin
ChangeDirectory(builddir)
`cat $patchdir/os-printlevel.patch` |> `patch -p1 -d ..`
setenv(`../configure --prefix=$prefix --enable-dependency-linking
coin_skip_warn_cflags=yes coin_skip_warn_cxxflags=yes coin_skip_warn_fflags=yes
pipeline(`cat $patchdir/os-printlevel.patch`, `patch -p1 -d ..`)
pipeline(`cat $patchdir/os-initialconditions.patch`, `patch -p1 -d ..`)
setenv(`../configure --prefix=$prefix coin_skip_warn_cflags=yes
coin_skip_warn_cxxflags=yes coin_skip_warn_fflags=yes
--with-coinutils-lib="-L$cbclibdir -lCoinUtils"
--with-coinutils-incdir=$cbcincdir
--with-osi-lib="-L$cbclibdir -lOsi -lCoinUtils"
Expand All @@ -68,4 +69,4 @@ provides(SimpleBuild,
end
end), [libOS], os = :Unix)

@BinDeps.install [:libOS => :libOS]
@BinDeps.install Dict([(:libOS, :libOS)])
Loading