[libreoffice] 08/11: use cpp-4.9 for urd preprocessing
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-vivid-4.4
in repository libreoffice.
commit 04c02dce495e0130fae3d572c25b81024851d428
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 28 18:21:27 2015 +0100
use cpp-4.9 for urd preprocessing
---
changelog | 1 +
rules | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 5b4cccb..24a9d27 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ libreoffice (1:4.4.0~rc3-1ubuntu1) UNRELEASED; urgency=medium
* use system mwaw, now that 0.3.4-1 is synced to main (LP: #1410883)
* reenable MERGELIBS
* reenable complex tests
+ * use cpp-4.9 for urd preprocessing
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 28 Jan 2015 17:40:59 +0100
diff --git a/rules b/rules
index 4dbd560..44d3dfd 100755
--- a/rules
+++ b/rules
@@ -1054,8 +1054,9 @@ else
# hardcode 4.7 as 4.8 fails:
# 14:17 <@caolan> ah, "build fails with cpp 4.8.0, this is fixable by passing
# -P, but then idlc produces empty urd files"
- IDLC_CPP_DEPENDS := cpp-4.7
- CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.7
+# trying to use cpp-4.9 instead now
+ IDLC_CPP_DEPENDS := cpp-4.9
+ CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.9
endif
BUILD_DEPS += , $(IDLC_CPP_DEPENDS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: