summaryrefslogtreecommitdiff
path: root/external/lpsolve
diff options
context:
space:
mode:
Diffstat (limited to 'external/lpsolve')
-rw-r--r--external/lpsolve/lp_solve_5.5.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/external/lpsolve/lp_solve_5.5.patch b/external/lpsolve/lp_solve_5.5.patch
index 124fed82343a..2f0f07d78059 100644
--- a/external/lpsolve/lp_solve_5.5.patch
+++ b/external/lpsolve/lp_solve_5.5.patch
@@ -55,8 +55,8 @@
rm *.o 2>/dev/null
--- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011
-@@ -1,23 +1,36 @@
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx
+@@ -1,23 +1,31 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
@@ -78,12 +78,7 @@
fi
-opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
-+if [ "$HAVE_GCC_NO_LONG_DOUBLE" = "YES" ] ; then
-+ opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
-+else
-+ opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
-+fi
-+
++opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src