The following commit has been merged in the master branch:
commit 9d6d620d4be9a79ed50bfac550cfc19f919a61c5
Author: Rene Engelhard <r...@debian.org>
Date: Wed Dec 28 20:12:27 2011 +0000
prevent creating bogus gcc- build-dependency on gcj archs
diff --git a/changelog b/changelog
index fce5e30..e8114a4 100644
--- a/changelog
+++ b/changelog
@@ -12,12 +12,14 @@ libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
* debian/vars.armhf: add
* debian/control.fonts.in: ttf-opensymbol should be in oldlibs, thanks
lintian
+ * debian/rules:
+ - prevent creating bogus gcc- build-dependency on gcj archs
[ Björn Michaelsen ]
* debian/patches/fix-armhf-build-in-bridges.patch: fix armhf build in
bridges
- -- Rene Engelhard <r...@debian.org> Tue, 27 Dec 2011 11:11:07 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 28 Dec 2011 20:57:18 +0100
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --git a/rules b/rules
index 2c285bf..29c42ed 100755
--- a/rules
+++ b/rules
@@ -472,6 +472,9 @@ ifeq "$(GCC_VERSION)" ""
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_ARCHS)))
GCJ_JDK_PACKAGE=$(shell dpkg -s gcj-jdk | grep Depends | sed -e
's/.*\(gcj-[0-9]\.[0-9]-jdk\).*/\1/')
GCJ_JDK_VERSION=$(shell echo $(GCJ_JDK_PACKAGE) | cut -d- -f2)
+ ifeq "$(GCJ_JDK_VERSION)" ""
+ $(error GCJ_JDK_VERSION not defined, you need gcj-jdk installed for
generating correct build-deps on $(GCJ_JDK_ARCHS))
+ endif
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCJ_JDK_VERSION)"
BUILD_DEPS += , gcc-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)],
g++-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)]
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
--
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/e1rg2xi-0001gr...@vasks.debian.org
