[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-50-g12883a8
The following commit has been merged in the debian-experimental-3.5 branch:
commit 12883a8562168385795f649f4b5440580ed0c67d
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 21 15:57:34 2011 +0200
--disable-linkoo
diff --git a/rules b/rules
index af4f3a2..9e9c108 100755
--- a/rules
+++ b/rules
@@ -646,6 +646,7 @@ endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , epm
+ CONFIGURE_FLAGS += --disable-linkoo
endif
ifeq "$(RUN_TESTTOOL)" "y"
CONFIGURE_FLAGS += --enable-hids
@@ -1659,7 +1660,6 @@ ifeq "$(DEB_HOST_ARCH)" "armel"
endif
cd $(SOURCE_TREE) && \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
export PATH=$(BUILD_PATH); \
export TMPDIR=$(CURDIR)/debian/smoketest; \
export HOME=$(CURDIR)/debian/smoketest; \
--
LibreOffice packaging repository
Reply to: