./packages/openofficeorg/3.1.1/unstable r1821: update STLport comment(s)
------------------------------------------------------------
revno: 1821
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2010-01-21 00:36:30 +0100
message:
update STLport comment(s)
modified:
rules
=== modified file 'rules'
--- a/rules 2010-01-18 02:04:26 +0000
+++ b/rules 2010-01-20 23:36:30 +0000
@@ -346,16 +346,16 @@
PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
# ./configure defaults to STLport on i386 and we should keep it for
-# ABI-compatability (at least until graphite01 and/or mysqlnative get in
-# at which time we need to use gccs STL if we want to use system-graphite /
-# system-mysqlcppconn)
+# ABI-compatability
OOO_STLPORT_ARCHS= i386
ifeq "$(ARCH)" "i386"
USE_STLPORT=y
endif
+# graphite and mysqlconnector built against libstc++s STL but OOo wants them
+# with STLport. Not possible without patch.
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
USE_SYSTEM_GRAPHITE=n
-# USE_SYSTEM_MYSQLCPPCONN=n
+ USE_SYSTEM_MYSQLCPPCONN=n
endif
ifeq "$(ENABLE_OPENGL)" "y"
Reply to: