diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-14 14:10:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-14 14:18:48 +0300 |
| commit | aa932258934f0a5f270e5e2ead0f092a32d466ec (patch) | |
| tree | 2af817331f10aff6d7801ac7966bc50c3b2d9167 | |
| parent | 225016198320a7e1d9a966de8e4ee357565e5b73 (diff) | |
Adapt for DISABLE_DYNLOADING
Change-Id: I0beb4dcf9051c678bde5d49b83cec697ab17c595
| -rw-r--r-- | lpsolve/lp_solve_5.5.patch | 15 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 9 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 2fdd679fafc4..013a6f94a473 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -133,3 +133,18 @@ +fi + +rm *.o 2>/dev/null +--- misc/build/lp_solve_5.5/lpsolve55/ccc.static ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.static +@@ -1,1 +1,11 @@ +-dummy ++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' ++obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'` ++ ++opts='-O3' ++ ++def= ++ ++$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src ++ls -l ++ar -r liblpsolve55.a $obj ++rm $obj diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index cfc3985d7140..6f0c9f93e038 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -47,13 +47,17 @@ PATCH_FILES=lp_solve_5.5-windows.patch PATCH_FILES=\ lp_solve_5.5.patch \ lp_solve-aix.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.static .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION= CONFIGURE_FLAGS= +.IF "$(DISABLE_DYNLOADING)" == "TRUE" +CONFIGURE_FLAGS+=--enable-static --disable-shared +.ENDIF + BUILD_DIR=lpsolve55 .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -79,6 +83,9 @@ OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll .EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose BUILD_ACTION=sh ccc.osx OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib +.ELIF "$(DISABLE_DYNLOADING)" == "TRUE" +BUILD_ACTION=sh ccc.static +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a .ELSE .IF "$(COMNAME)"=="sunpro5" BUILD_ACTION=sh ccc.solaris |