diff --git a/lpsolve.spec b/lpsolve.spec index 04c9544..dd2800c 100644 --- a/lpsolve.spec +++ b/lpsolve.spec @@ -10,6 +10,7 @@ BuildRequires: gcc-c++ Patch0: lpsolve-5.5.0.11.cflags.patch Patch1: lpsolve-5.5.2.0.defines.patch +Patch2: read-cc-from-env.patch %description Mixed Integer Linear Programming (MILP) solver lpsolve solves pure linear, @@ -26,6 +27,7 @@ Includes and definitions for developing with lpsolve %setup -q -n lp_solve_5.5 %patch0 -p1 -b .cflags.patch %patch1 -p1 -b .defines.patch +%patch2 -p1 -b .cc-from-env.patch %build %set_build_flags diff --git a/read-cc-from-env.patch b/read-cc-from-env.patch new file mode 100644 index 0000000..85c7320 --- /dev/null +++ b/read-cc-from-env.patch @@ -0,0 +1,22 @@ +diff -ruN lp_solve_5.5.orig/lp_solve/ccc lp_solve_5.5/lp_solve/ccc +--- lp_solve_5.5.orig/lp_solve/ccc 2020-12-08 12:24:15.118953722 +0100 ++++ lp_solve_5.5/lp_solve/ccc 2020-12-08 12:49:39.661428497 +0100 +@@ -1,6 +1,6 @@ + : + src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.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_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +-c=cc ++c=$CC + + #determine platform (32/64 bit) + >/tmp/platform.c +diff -ruN lp_solve_5.5.orig/lpsolve55/ccc lp_solve_5.5/lpsolve55/ccc +--- lp_solve_5.5.orig/lpsolve55/ccc 2020-12-08 12:24:15.118953722 +0100 ++++ lp_solve_5.5/lpsolve55/ccc 2020-12-08 12:40:22.677752522 +0100 +@@ -1,6 +1,6 @@ + : + 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 + + #determine platform (32/64 bit) + >/tmp/platform.c