[libreoffice] 01/02: fix BUILD_DEPS setting for (u)cpp
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 97da58203cefc16454b0f121bb812fc2a9253a3b
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 8 00:17:09 2014 +0200
fix BUILD_DEPS setting for (u)cpp
---
rules | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/rules b/rules
index a23d73d..6bdbab8 100755
--- a/rules
+++ b/rules
@@ -1006,7 +1006,6 @@ endif
ifeq "$(USE_UCPP)" "y"
ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
IDLC_CPP_DEPENDS := ucpp
- BUILD_DEPS += , $(UCPP_DEPENDS)
endif
else
# hardcode 4.7 as 4.8 fails:
@@ -1014,8 +1013,8 @@ else
# -P, but then idlc produces empty urd files"
IDLC_CPP_DEPENDS := cpp-4.7
CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.7
- BUILD_DEPS += , cpp-4.7
endif
+ BUILD_DEPS += , $(IDLC_CPP_DEPENDS)
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: