The following commit has been merged in the debian-experimental-4.0 branch:
commit 724497e7f540e9c4407bb85698b9c03abe59a325
Author: Rene Engelhard <r...@debian.org>
Date: Tue Feb 19 14:35:45 2013 +0100
explicitly use cpp-4.7
diff --git a/changelog b/changelog
index e4edbf5..9e6dfe2 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,7 @@ libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
honours those from the env in configure. Remove manual passing to make.
- conditionalize pyuno build/install more so that we can build only
python-uno
on wheezy-backports. Bit obscure, but...
+ - explicitly use cpp-4.7 as cpp 4.8 would fail
-- Rene Engelhard <r...@debian.org> Thu, 14 Feb 2013 22:07:36 +0100
diff --git a/rules b/rules
index cbc3ccf..fa82f5b 100755
--- a/rules
+++ b/rules
@@ -884,8 +884,12 @@ ifeq "$(USE_UCPP)" "y"
BUILD_DEPS += , $(UCPP_DEPENDS)
endif
else
- IDLC_CPP_DEPENDS := cpp
- CONFIGURE_FLAGS += --with-idlc-cpp=cpp
+# 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
+ BUILD_DEPENDS += , cpp-4.7
endif
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u7qyq-0003xc...@vasks.debian.org
