[libreoffice] 01/01: fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit b3fb76b3876e00fb75161bf33c298fd63429b4a4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Oct 1 23:00:55 2015 +0200
fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty
---
changelog | 6 ++++++
rules | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/changelog b/changelog
index dbdb4bf..8a9d0b4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.2-0ubuntu2~wily1~ppa1) wily; urgency=medium
+
+ * fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 01 Oct 2015 22:59:32 +0200
+
libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
* new upstream release
diff --git a/rules b/rules
index 063d95c..e788b9b 100755
--- a/rules
+++ b/rules
@@ -730,6 +730,11 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
+ # set SYSTEM_GCJ_VERSION to something nonempty
+ ifeq (,$(strip $(SYSTEM_GCJ_VERSION)))
+ $(warning SYSTEM_GCJ_VERSION empty, falling back to SYSTEM_GCC_VERSION)
+ SYSTEM_GCJ_VERSION = $(SYSTEM_GCC_VERSION)
+ endif
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: