[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-2-7-g3a6e7b1
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 138658bb4bf86cf49bac26d0510dbde9a7c58096
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 20 14:12:50 2011 +0200
explicitely specify --without-stlport
diff --git a/changelog b/changelog
index 1c04af5..13c3c3e 100644
--- a/changelog
+++ b/changelog
@@ -19,6 +19,7 @@ libreoffice (1:3.4.1-2) experimental; urgency=low
- remove obsolete libstlport4.6-dev build-conflict, thanks Björn
Michaelsen
- fix conditional for translate-toolkit
+ - explicitely specify --without-stlport
* debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
* merge from ubuntu-oneiric-3.4:
- gconf also needs liborbit2-dev
diff --git a/rules b/rules
index 737c469..482f1e1 100755
--- a/rules
+++ b/rules
@@ -863,8 +863,11 @@ ifeq "$(USE_AGG)" "y"
endif
ifneq "$(OOO_STLPORT_ARCHS)" ""
+ ifeq "$(LINK_TO_STLPORT)" "y"
LIBSTLPORT_MINVER= (>= 4.6.2-3)
BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
+ CONFIGURE_FLAGS += --without-stlport
+ endif
endif
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: