[libreoffice] 01/01: set FIREBIRD_{CFLAGS, VERSION, LIBS} to fix configure with firebird 3....
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 669a9489af1f0611d46cea71157fca96dbaec728
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 4 16:39:38 2016 +0200
set FIREBIRD_{CFLAGS,VERSION,LIBS} to fix configure with firebird 3....
---
rules | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/rules b/rules
index 039cec6..99e9a00 100755
--- a/rules
+++ b/rules
@@ -1313,6 +1313,13 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS)
+ # hack for firebird 3. configure expects fb_config or pkg-config, neither of
+ # which firebird 3 provides. WTF? (See http://bugs.debian.org/826320)
+ ifeq "$(shell dpkg --compare-versions `dpkg -l firebird-dev | grep ^ii | awk '{ print $$3 }'` ge 3 && echo true)" "true"
+export FIREBIRD_VERSION=3.0.0
+export FIREBIRD_LIBS=-lfbclient
+export FIREBIRD_CFLAGS="-I/usr/include/firebird"
+ endif
endif
else
CONFIGURE_FLAGS += --disable-firebird-sdbc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: