ooo-build r12313 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Apr 23 19:27:51 2008
New Revision: 12313
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12313&view=rev

Log:
        * patches/src680/system-lpsolve-link-with-colamd.diff: update for
        sccomp


Modified:
   trunk/ChangeLog
   trunk/patches/src680/system-lpsolve-link-with-colamd.diff

Modified: trunk/patches/src680/system-lpsolve-link-with-colamd.diff
==============================================================================
--- trunk/patches/src680/system-lpsolve-link-with-colamd.diff	(original)
+++ trunk/patches/src680/system-lpsolve-link-with-colamd.diff	Wed Apr 23 19:27:51 2008
@@ -1,8 +1,13 @@
---- scsolver/util/makefile.mk-old	2006-06-20 14:25:21.000000000 +0200
-+++ scsolver/util/makefile.mk	2006-06-20 14:27:13.000000000 +0200
-@@ -29,6 +29,12 @@
- 	$(TOOLSLIB) \
- 	$(LPSOLVELIB)
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/sc/sccomp/source/solver/makefile.mk,v
+retrieving revision 1.3
+diff -u -u -r1.3 makefile.mk
+--- sccomp/source/solver/makefile.mk	11 Apr 2008 10:47:12 -0000	1.3
++++ sccomp/source/solver/makefile.mk	23 Apr 2008 19:24:41 -0000
+@@ -70,6 +70,12 @@
+ 
+ RESLIB1LIST=$(SRS)$/solver.srs
  
 +# DebianBaseOnly; we build lp_solve without colamd included but with system-colamd
 +# (which is not linked into the .a...) so we need -lcolamd here, too
@@ -10,6 +15,6 @@
 +SHL1STDLIBS += -lcolamd
 +.ENDIF
 +
- RESLIB1NAME=scsolver
- RESLIB1SRSFILES= $(SRS)/scsolver.srs
+ RESLIB1NAME=solver
+ RESLIB1SRSFILES=$(RESLIB1LIST)