Fix build from source with Clang (#37)

JuliaOpt · Mar 2, 2018 · 6b85bd6 · 6b85bd6
1 parent 0377dad
commit 6b85bd6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -46,6 +46,7 @@ provides(SimpleBuild,
         @build_steps begin
             ChangeDirectory(builddir)
             pipeline(`cat $patchdir/os-printlevel.patch`, `patch -p1 -d ..`)
+            pipeline(`cat $patchdir/ordered-compare-error.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
                 --with-coinutils-lib="-L$cbclibdir -lCoinUtils"

diff --git a/deps/ordered-compare-error.patch b/deps/ordered-compare-error.patch
@@ -0,0 +1,11 @@
+--- /SYMPHONY/src/LP/lp_genfunc.c	2015-03-07 15:52:32.000000000 -0500
++++ /SYMPHONY/src/LP/lp_genfunc.c	2017-11-14 10:03:57.000000000 -0500
+@@ -2419,7 +2419,7 @@
+ 			     send_to_pool);
+
+       should_stop_adding_cgl_cuts(p, i, &should_stop);
+-      if(i < 0 && num_cuts > 0) should_stop = TRUE;
++      if(i < 0 && *num_cuts > 0) should_stop = TRUE;
+       //}
+       if (should_stop == TRUE) {
+          break;