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

René Engelhard rene at kemper.freedesktop.org
Tue Sep 28 23:38:46 PDT 2010


 patches/dev300/fields-table-formula.diff |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 78848bf68e4136ce0d6566cf5a5375d03e893a31
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 29 08:38:16 2010 +0200

    fix sw build; use -lixion-0.2 on UNX instead of -lixionlib

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index 71be3b4..4bc6134 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -224,11 +224,16 @@ diff --git solenv/inc/libs.mk solenv/inc/libs.mk
 index 7e355b2..150c236 100644
 --- solenv/inc/libs.mk
 +++ solenv/inc/libs.mk
-@@ -297,6 +297,8 @@ REDLANDLIB=-lrdf
+@@ -297,6 +297,13 @@ REDLANDLIB=-lrdf
  .ENDIF
  
  
-+IXIONLIB=-lixionlib -lboost_thread-mt -pthread
++.IF "$(GUI)" != "UNX"
++IXIONLIB=-lixionlib
++.ELSE
++IXIONLIB=-lixion-0.2
++.ENDIF
++IXIONLIB+= -lboost_thread-mt -pthread
 +
  # #110743#
  # For BinFilters, some libs were added.


More information about the ooo-build-commit mailing list