[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 821fa63bca2a6d92286807d8efc904192ae0d983
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 d83c912..7fa00bb 100755
--- a/rules
+++ b/rules
@@ -499,6 +499,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: