[ooo-build-commit] .: patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Wed Sep 29 15:17:31 PDT 2010
patches/dev300/fields-table-formula.diff | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
New commits:
commit 46ee5424a7a4227ff3fa42177345cc74d47875e2
Author: Rene Engelhard <rene at debian.org>
Date: Thu Sep 30 00:16:19 2010 +0200
use --with-pic in ixions build instead of patching Makefile.in
diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index 6a3f78c..68daa3d 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -1,17 +1,3 @@
---- /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
@@ -58,14 +44,14 @@ 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
+.ELSE
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
-+CONFIGURE_FLAGS=--disable-shared
++CONFIGURE_FLAGS=--disable-shared --with-pic
+BUILD_ACTION=$(GNUMAKE)
+BUILD_DIR=$(CONFIGURE_DIR)
+OUT2LIB+=src/libixion/.libs$/libixion*.a
More information about the ooo-build-commit
mailing list