The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 557238bfe71aeaea9ce93f6108cf476c30015377
Author: Bjoern Michaelsen <[email protected]>
Date: Wed May 23 21:04:15 2012 +0200
update dep-track disabling
diff --git a/rules b/rules
index 7fa00bb..064d248 100755
--- a/rules
+++ b/rules
@@ -321,7 +321,8 @@ CONFIGURE_FLAGS= \
--disable-fetch-external \
--enable-release-build \
--without-fonts \
- --without-myspell-dicts
+ --without-myspell-dicts \
+ --disable-dependency-tracking
ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
@@ -1604,7 +1605,7 @@ build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: config.status
dh_testdir
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS=
gb_Deliver_HARDLINK=T
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_Deliver_HARDLINK=T
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON3)" "y"
@@ -1618,7 +1619,7 @@ ifeq "$(BUILD_PYUNO)" "y"
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS=
gb_Deliver_HARDLINK=T
+ unset DISPLAY && $(CURDIR)/debian/rules check gb_Deliver_HARDLINK=T
endif
touch $@
@@ -1640,7 +1641,7 @@ endif
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
+ $(MAKE) -k check gb_Deliver_HARDLINK=T && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
