[ooo-build-commit] .: patches/dev300

[René Engelhard]

 patches/dev300/system-lpsolve-link-with-colamd.diff |   43 +++++++++-----------
 1 file changed, 20 insertions(+), 23 deletions(-)

New commits:
commit 4fff9df877047fd183123e3bbe50fb91b80eb5f6
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Aug 1 09:28:26 2010 -0400

    regen system-lpsolve-link-with-colamd.diff and make it apply all parts...
    
    * patches/dev300/system-lpsolve-link-with-colamd.diff:

diff --git a/patches/dev300/system-lpsolve-link-with-colamd.diff b/patches/dev300/system-lpsolve-link-with-colamd.diff
index 54de2bd..0c3c7c2 100644
--- a/patches/dev300/system-lpsolve-link-with-colamd.diff
+++ b/patches/dev300/system-lpsolve-link-with-colamd.diff
@@ -1,26 +1,7 @@
-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
-+.IF "$(SYSTEM_LPSOLVE)" == "YES"
-+SHL1STDLIBS += -lcolamd
-+.ENDIF
-+
- RESLIB1NAME=solver
- RESLIB1SRSFILES=$(RESLIB1LIST)
- 
---- configure.in-old	2009-10-23 10:40:02.000000000 +0200
-+++ configure.in	2009-10-23 10:40:35.000000000 +0200
-@ -5185,6 +5185,7 @@
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -5185,6 +5185,7 @@
      # some systems need this. Like Ubuntu....
      AC_CHECK_LIB(m, floor)
      AC_CHECK_LIB(dl, dlopen)
@@ -28,3 +9,19 @@ diff -u -u -r1.3 makefile.mk
      AC_CHECK_LIB(lpsolve55, make_lp, ,
          [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
  else
+diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk
+--- sccomp/source/solver/makefile.mk
++++ sccomp/source/solver/makefile.mk
+@@ -58,6 +58,12 @@
+                 $(TOOLSLIB)         \
+                 $(LPSOLVELIB)
+ 
++# 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
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++SHL1STDLIBS += -lcolamd
++.ENDIF
++
+ SHL1DEPN=       makefile.mk
+ SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
+ SHL1VERSIONMAP= $(SOLARENV)/src/component.map