ooo-build r13526 - in trunk: . patches/scsolver

[pmladek svn gnome org]

Author: pmladek
Date: Tue Aug 12 14:27:50 2008
New Revision: 13526
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13526&view=rev

Log:
2008-08-12  Petr Mladek  <pmladek suse cz>

	* patches/scsolver/scsolver-lpsolve.diff: compile lpsolve with -fpic;
	  it can't be linked staticaly to the Kohei's scsolver otherwise



Modified:
   trunk/ChangeLog
   trunk/patches/scsolver/scsolver-lpsolve.diff

Modified: trunk/patches/scsolver/scsolver-lpsolve.diff
==============================================================================
--- trunk/patches/scsolver/scsolver-lpsolve.diff	(original)
+++ trunk/patches/scsolver/scsolver-lpsolve.diff	Tue Aug 12 14:27:50 2008
@@ -25,3 +25,21 @@
  ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
  ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
  ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll
+--- lpsolve/lp_solve_5.5.patch.old	2008-08-12 16:19:58.000000000 +0200
++++ lpsolve/lp_solve_5.5.patch	2008-08-12 16:19:18.000000000 +0200
+@@ -7,6 +7,15 @@
+  
+  def=
+  so=
++@@ -12,7 +12,7 @@ fi
++ 
++ opts='-O3'
++ 
++-$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
+++$c -fpic -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
++ 
+ --- misc/lp_solve_5.5/lpsolve55/ccc.osx	Thu Jun 23 22:53:08 2005
+ +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx	Wed May 21 17:19:56 2008
+ @@ -3,6 +3,10 @@