Hi, Nathanael Nerode wrote: > OK. So I think openoffice.org 2.0 is the correct time to abandon stlport. > The advantages are numerous: > * no patching around STLport build problems We don't use the internal copy so patching is the stlports maintainers work which he should do anyway regardless of whether OOo uses it or not :) > * faster build How? We don't build STLport ;) > OOo already works with GCC's STL (there are a few namespace-shuffling > patches needed, but they're already in the upstream tree). The only reason Sure it will work? See http://lists.ximian.com/pipermail/openoffice/2005-August/001090.html (and the referenced http://lists.ximian.com/pipermail/openoffice/2005-August/001090.html) > This patch to debian/rules should stop STLport from being used. Due to the > screwiness of the OOo build system, I'm not actually sure it prevents it > >from being *built*. (Actually, I'm not 100% sure it stops it from being used, As said, STLport already is not built. That's what the USE_SYSTEM_STLPORT conditional is for. The packages also have a dependency on libstlport4.6c2. > -USE_SYSTEM_STLPORT=y > +USE_SYSTEM_STLPORT=n > ifeq "$(USE_SYSTEM_STLPORT)" "y" > BUILD_DEPS += , libstlport4.6-dev (>= 4.6.2-3) > DEV_STL_DEPENDS=, libstlport4.6-dev (>= 4.6.2-3) > @@ -205,6 +205,12 @@ > CONFIGURE_FLAGS+= --with-stlport4=$(CURDIR)/stlport4 > endif > > +# NCN: Build without stlport, using GCC's STL. > +NO_STLPORT=y > +ifeq "$(NO_STLPORT)" "y" > + CONFIGURE_FLAGS += --without-stlport4 > +endif > + If, I would do that in one conditional. Like: USE_STLPORT=n USE_SYSTEM_STLPORT=y ifneq "$(USE_STLPORT)" "y" CONFIGURE_FLAGS += --without-stlport4 else ifeq "$(USE_SYSTEM_STLPORT)" "y" [...] endif Regards, Rene
Attachment:
signature.asc
Description: Digital signature