[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 5e4ef94c346a58a3eb39de81217131a158b35e68
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue May 15 23:25:03 2012 +0200
hardwire GCJ version for now
diff --git a/rules b/rules
index 943430d..491148b 100755
--- a/rules
+++ b/rules
@@ -505,6 +505,10 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
RUN_MAKE_CHECK:=n
endif
+ PARALLEL_BUILD=y
+
+ #temp. hacks
+ GCJ_JDK_VERSION=4.6
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
LibreOffice packaging repository
Reply to: