aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-3-devel/files/patch-i85972
blob: 931cbb8c535dc56f4f1c560463540bf2a6ee1b8c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Index: lpsolve/lp_solve_5.5.patch
===================================================================
RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
retrieving revision 1.4
diff -u -r1.4 lp_solve_5.5.patch
--- lpsolve/lp_solve_5.5.patch	16 Jun 2008 14:19:46 -0000	1.4
+++ lpsolve/lp_solve_5.5.patch	3 Jul 2008 00:20:52 -0000
@@ -72,3 +72,25 @@
 +fi
 +
 +rm *.o 2>/dev/null
+--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:45:07 2008
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:44:54 2008
+@@ -1,1 +1,18 @@
+-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'
++
++c=$CC
++def=
++so=yes
++
++opts='-O3 -DINTEGERTIME'
++$CC -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
++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++ranlib liblpsolve55.a
++
++if [ "$so" != "" ]
++then
++  $CC -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
++  $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
++fi
++
++rm *.o 2>/dev/null
Index: lpsolve/makefile.mk
===================================================================
RCS file: /cvs/external/lpsolve/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
+++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
@@ -46,7 +46,7 @@
 PATCH_FILE_NAME=lp_solve_5.5-windows.patch
 .ELSE
 PATCH_FILE_NAME=lp_solve_5.5.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
 .ENDIF
 
 CONFIGURE_DIR=
@@ -70,11 +70,16 @@
 .IF "$(COMNAME)"=="sunpro5"
 BUILD_ACTION=sh ccc.solaris
 .ELSE
+.IF "$(OS)"=="FREEBSD"
+BUILD_ACTION=sh -x ccc.freebsd
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+.ELSE
 BUILD_ACTION=sh ccc
 .ENDIF
 OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
 .ENDIF
 .ENDIF
+.ENDIF
 
 OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h