diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-15 14:05:09 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-15 15:24:36 +0200 |
| commit | f649237f0adeb0d01e8a6a4d87ea85250be80ce9 (patch) | |
| tree | 1641fd4a3a6d06525db61c70b87d78c7d6f04ce7 /lpsolve | |
| parent | 3074bc8f47c2fdb955f22e22dbb6aaee0ffad9b3 (diff) | |
Propagate verbosity to lpsolve build
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/lp_solve_5.5.patch | 6 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 43c9e0739744..bca62f422fcd 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -56,11 +56,15 @@ 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,32 @@ +@@ -1,23 +1,36 @@ 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 ++if test -n "$verbose"; then ++ set -x ++fi ++ def= so= +extra_cflags=$EXTRA_CFLAGS diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 232faad5d9a0..c91e3a02de91 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -74,7 +74,7 @@ OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll .ELSE .IF "$(OS)"=="MACOSX" -.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS +.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose BUILD_ACTION=sh ccc.osx OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib .ELIF "$(OS)"=="IOS" |