The following commit has been merged in the master branch:
commit 4e371e96f4da33196f4941ba056261403154fd9b
Author: Rene Engelhard <[email protected]>
Date: Thu Apr 12 01:31:31 2012 +0200
readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if GCC_VERSION !=
""...."
diff --git a/changelog b/changelog
index 6b1085a..d651fdf 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,11 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
* debian/patches/icu-4.9.diff: backport fix from libreoffice-3-5
for ICU >= 4.9 support
- -- Rene Engelhard <[email protected]> Wed, 11 Apr 2012 20:04:43 +0200
+ * debian/rules:
+ - readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
+ GCC_VERSION != ""....
+
+ -- Rene Engelhard <[email protected]> Thu, 12 Apr 2012 01:28:53 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
diff --git a/rules b/rules
index 1efb297..7ad1269 100755
--- a/rules
+++ b/rules
@@ -478,6 +478,12 @@ CONFIGURE_FLAGS += $(foreach i,
$(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
+ifneq "$(GCC_VERSION)" ""
+ ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
+ BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ endif
+endif
+
BUILDDEB_OPTIONS = -- -Zbzip2
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
