The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit f0d4777f4a1170860dd4877d368599623ee54f69
Author: Bjoern Michaelsen <[email protected]>
Date: Mon Feb 28 09:45:11 2011 +0100
reenable verbose build on ubuntu buildd (closes: #726333)
diff --git a/changelog b/changelog
index ac9d8a3..133cc07 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.1-1ubuntu4) natty; urgency=low
+
+ * reenable verbose build on ubuntu buildd (closes: #726333)
+
+ -- Bjoern Michaelsen <[email protected]> Mon, 28 Feb 2011
09:44:27 +0100
+
libreoffice (1:3.3.1-1ubuntu3) natty; urgency=low
* disabled smoketest completely on natty to get rid of dep on epm
diff --git a/rules b/rules
index 377a931..f3baf59 100755
--- a/rules
+++ b/rules
@@ -50,6 +50,7 @@ SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/
# Debian buildds run as user `buildd', other are using /CurrentlyBuilding
ON_BUILDD := $(shell [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] && echo
y || echo n)
+ON_BUILDD_VERBOSITY :=
PKGDIR:=debian/libreoffice$(VER)
OODIRNAME=libreoffice$(VER)
@@ -494,6 +495,7 @@ ifeq "$(DIST)" "Ubuntu"
L10N_SEPARATE_SOURCE=y
USE_COMMON_DOCDIR=y
IMAGES += human
+ ON_BUILDD_VERBOSITY := true
ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
BUILD_ONLY_EN_US=y
endif
@@ -1889,11 +1891,14 @@ ifeq "$(BUILD_KDE)" "n"
fi
endif
-ifeq ($(ON_BUILDD),y)
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
-else
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
-endif
+ cd $(OOO_BUILD_TREE) ; \
+ PATH=$(BUILD_PATH) \
+ LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ DEFAULT_TO_ENGLISH_FOR_PACKING=1 \
+ VERBOSE=$(if $(filter
y,$(ON_BUILDD)),$(ON_BUILDD_VERBOSITY),true) \
+ ARCH_FLAGS=$(ARCH_FLAGS) \
+ TMP=`mktemp -q -d` \
+ $(MAKE)
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
--
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]
