[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-17-g308e349



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit d992ada57f0b35c2ac345cee4204b0393204a0c0
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jul 18 11:21:02 2011 +0000

    build-dep on make (>= 3.82) if PARALLEL_BUILD=y

diff --git a/rules b/rules
index 24a082e..56d91be 100755
--- a/rules
+++ b/rules
@@ -1136,6 +1136,7 @@ ifeq "$(NUM_CPUS)" ""
 	# according to Pavel Janik, build -P<number of cores> -- -P2
 	# is ideal. This sets the first -P according to the number
 	# of CPUs (where dual-core CPUS report 2, too)
+        BUILD_DEPS += make (>= 3.82)
     ifneq ($(AVAIL_CPUS),1)
 	NUM_CPUS := $(shell expr $(AVAIL_CPUS))
     endif

-- 
LibreOffice packaging repository


Reply to: