Bump for 3.6-28
[LibreOffice.git] / lpsolve / lp_solve_5.5.patch
blobbca62f422fcda26f81a50dd67c488370f87d651f
1 --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005
2 +++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011
3 @@ -1,25 +1,42 @@
4 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'
5 -c=cc
6 +ar=$AR
7 +c=$CC
8 +ranlib=$RANLIB
10 def=
11 so=
12 -if [ "$PLATFORM" = "SCO_UNIX" ]
13 -then def='-dy -K PIC -DNOLONGLONG'
14 - dl=-lc
15 -else dl=-ldl
16 - so=y
17 +soprefix=
18 +libs=
19 +pic=
20 +ldflags=
21 +inline=
22 +if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
23 + so=dll
24 + a=dll.a
25 + inline=-DINLINE=static
26 +else
27 + so=so
28 + a=a
29 + soprefix=lib
30 + libs="-lm"
31 + pic=-fpic
32 + ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
35 +if [ "$OS" = "LINUX" ]; then
36 + libs="$libs -ldl"
37 +fi
39 opts='-O3'
41 -$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
42 +$c -s $inline -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
43 -ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
44 -ranlib liblpsolve55.a
45 +$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
46 +$ranlib liblpsolve55.$a
48 if [ "$so" != "" ]
49 then
50 - $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
51 - $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
52 + $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
53 + $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
56 rm *.o 2>/dev/null
57 --- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
58 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011
59 @@ -1,23 +1,36 @@
60 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'
61 -c=cc
62 +c=$CC
64 +if test -n "$verbose"; then
65 + set -x
66 +fi
68 def=
69 so=
70 +extra_cflags=$EXTRA_CFLAGS
71 +extra_cdefs=$EXTRA_CDEFS
72 +extra_linkflags=$EXTRA_LINKFLAGS
74 if [ "$PLATFORM" = "SCO_UNIX" ]
75 then def='-DLoadInverseLib=0 -DLoadLanguageLib=0 -D__HYPER=long'
76 else dl=-ldl
77 so=y
80 -opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
81 +if [ "$HAVE_GCC_NO_LONG_DOUBLE" = "YES" ] ; then
82 + opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
83 +else
84 + opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
85 +fi
88 -$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
89 +$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
90 libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
92 if [ "$so" != "" ]
93 then
94 - $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
95 - $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
96 + $c $extra_cflags -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
97 + $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
100 rm *.o 2>/dev/null
101 --- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig Sun May 22 11:19:48 2011
102 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Sun May 22 11:19:48 2011
103 @@ -1 +1,31 @@
104 -dummy
105 +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'
106 +c=$CC
108 +if [ "$CPU" = "U" -o "$CPU" = "X" ]
109 +then
110 + extra_cflags=-m64
111 + extra_linkflags=-m64
114 +def=
115 +so=
116 +if [ "$PLATFORM" = "SCO_UNIX" ]
117 +then def='-dy -K PIC -DNOLONGLONG'
118 + dl=-lc
119 +else dl=-ldl
120 + so=y
123 +opts='-xO3'
125 +$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 $src
126 +ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
127 +ranlib liblpsolve55.a
129 +if [ "$so" != "" ]
130 +then
131 + $c $extra_cflags -K PIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
132 + $c $extra_linkflags -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $SOLARLIB -lc -lm -ldl
135 +rm *.o 2>/dev/null
136 --- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011
137 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios Sun May 22 11:19:48 2011
138 @@ -1 +1,11 @@
139 -dummy
140 +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'
141 +obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
143 +opts='-O3'
145 +def=
147 +$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
148 +ls -l
149 +ar -r liblpsolve55.a $obj
150 +rm $obj