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

[René Engelhard]

 patches/dev300/fields-table-formula.diff |   66 +++++++------------------------
 1 file changed, 15 insertions(+), 51 deletions(-)

New commits:
commit 704c1b8f564337a674ad6b44be6a5a907a0eef9b
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 29 09:28:32 2010 +0200

    ixion needs to be built with -fPIC to be linked into a shared lib (libsw)

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index 4bc6134..f4e4634 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -1,53 +1,17 @@
-diff --git ixion/ixion-0.2.0.diff ixion/ixion-0.2.0.diff
-new file mode 100644
-index 0000000..5aa43a6
---- /dev/null
-+++ ixion/ixion-0.2.0.diff
-@@ -0,0 +1,44 @@
-+--- /dev/null
-++++ misc/build/ixion-0.2.0/src/libixion/makefile.mk
-+@@ -0,0 +1,41 @@
-++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-++
-++PRJ=..$/..$/..$/..$/..$/..
-++
-++PRJNAME=libixion
-++TARGET=ixionlib
-++ENABLE_EXCEPTIONS=TRUE
-++LIBTARGET=NO
-++
-++.INCLUDE :  settings.mk
-++
-++CFLAGS+=-I..$/..$/inc -std=c++0x
-++
-++.IF "$(GUI)"=="WNT"
-++CFLAGS+=-GR
-++.ENDIF
-++.IF "$(COM)"=="GCC"
-++CFLAGSCXX+=-frtti
-++.ENDIF
-++
-++SLOFILES= \
-++			$(SLO)$/cell.obj \
-++			$(SLO)$/cell_queue_manager.obj \
-++			$(SLO)$/depends_tracker.obj \
-++			$(SLO)$/formula_functions.obj \
-++			$(SLO)$/formula_interpreter.obj \
-++			$(SLO)$/formula_lexer.obj \
-++			$(SLO)$/formula_parser.obj \
-++			$(SLO)$/formula_result.obj \
-++			$(SLO)$/formula_tokens.obj \
-++			$(SLO)$/global.obj \
-++			$(SLO)$/lexer_tokens.obj \
-++			$(SLO)$/mem_str_buf.obj \
-++			$(SLO)$/model_parser.obj \
-++			$(SLO)$/sort_input_parser.obj \
-++
-++LIB1ARCHIV=$(LB)$/libixionlib.a
-++LIB1TARGET=$(SLB)$/$(TARGET).lib
-++LIB1OBJFILES= $(SLOFILES)
-++
-++.INCLUDE :  target.mk
+--- /dev/null   2010-09-28 02:28:57.560060918 +0200
++++ ixion/ixion-0.2.0.diff    2010-09-29 09:23:27.000000000 +0200
+@@ -0,0 +1,11 @@
++--- misc/build/ixion-0.2.0/src/libixion/Makefile.in    2010-09-29 09:18:08.000000000 +0200
+++++ misc/build/ixion-0.2.0/src/libixion/Makefile.in    2010-09-29 09:18:22.000000000 +0200
++@@ -121,7 +121,7 @@
++ CXX = @CXX@
++ CXXCPP = @CXXCPP@
++ CXXDEPMODE = @CXXDEPMODE@
++-CXXFLAGS = @CXXFLAGS@
+++CXXFLAGS = @CXXFLAGS@ -fPIC
++ CYGPATH_W = @CYGPATH_W@
++ DEFS = @DEFS@
++ DEPDIR = @DEPDIR@
 diff --git ixion/makefile.mk ixion/makefile.mk
 new file mode 100644
 index 0000000..c847995
@@ -94,7 +58,7 @@ index 0000000..c847995
 +
 +TARFILE_NAME=ixion-0.2.0
 +TARFILE_MD5=0f63ee487fda8f21fafa767b3c447ac9
-+#PATCH_FILES=$(TARFILE_NAME).diff
++PATCH_FILES=$(TARFILE_NAME).diff
 +.IF "$(GUI)" != "UNX"
 +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 +BUILD_DIR=src$/libixion