incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1180508 - in /incubator/ooo/trunk/main/lpsolve: lp_solve_5.5.patch makefile.mk
Date Sun, 09 Oct 2011 00:52:51 GMT
Author: pfg
Date: Sun Oct  9 00:52:51 2011
New Revision: 1180508

URL: http://svn.apache.org/viewvc?rev=1180508&view=rev
Log:
i85972: FreeBSD port: build breakage at the module lpsolve.

Modified:
    incubator/ooo/trunk/main/lpsolve/lp_solve_5.5.patch
    incubator/ooo/trunk/main/lpsolve/makefile.mk

Modified: incubator/ooo/trunk/main/lpsolve/lp_solve_5.5.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lpsolve/lp_solve_5.5.patch?rev=1180508&r1=1180507&r2=1180508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lpsolve/lp_solve_5.5.patch (original)
+++ incubator/ooo/trunk/main/lpsolve/lp_solve_5.5.patch Sun Oct  9 00:52:51 2011
@@ -92,3 +92,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

Modified: incubator/ooo/trunk/main/lpsolve/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lpsolve/makefile.mk?rev=1180508&r1=1180507&r2=1180508&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lpsolve/makefile.mk (original)
+++ incubator/ooo/trunk/main/lpsolve/makefile.mk Sun Oct  9 00:52:51 2011
@@ -43,7 +43,7 @@ TARFILE_MD5=26b3e95ddf3d9c077c480ea45874
 PATCH_FILES=lp_solve_5.5-windows.patch
 .ELSE
 PATCH_FILES=lp_solve_5.5.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
 .ENDIF
 
 CONFIGURE_DIR=
@@ -77,11 +77,16 @@ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
 .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
 



Mime
View raw message