[libreoffice] 01/01: build-depend on gcc 7 for m68k

[Rene Engelhard]

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 d00fac085e4e9b96b85e4eac23789764c0a2d1da
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jan 12 22:16:41 2017 +0100

    build-depend on gcc 7 for m68k
---
 changelog |  4 ++++
 control   |  2 ++
 rules     | 10 ++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 63b93e1..4acb2ca 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,10 @@ libreoffice (1:5.3.0~rc2~git20161229-1) UNRELEASED; urgency=medium
   * debian/patches/m68k-use-mlong-jump-table-offsets.diff: add;
     as name says
 
+  * debian/rules:
+    - build-depend on gcc-7/g++-7 (>= 7-20170106) for m68k for
+      -mlong-jump-table-offsets
+
  -- Rene Engelhard <rene at debian.org>  Thu, 29 Dec 2016 15:21:41 +0100
 
 libreoffice (1:5.3.0~rc1-2) experimental; urgency=medium
diff --git a/control b/control
index 8015da6..b6a9bbc 100644
--- a/control
+++ b/control
@@ -28,6 +28,8 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
                fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
                fonts-liberation [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+               g++-7 (>= 7-20170106) [m68k],
+               gcc-7 (>= 7-20170106) [m68k],
                gdb [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
                gettext,
                gobject-introspection (>= 1.32.0),
diff --git a/rules b/rules
index aa6da38..553c227 100755
--- a/rules
+++ b/rules
@@ -712,6 +712,9 @@ CC_PREFIX:=$(shell gcc -dumpmachine)-
 #    endif
 #  endif
 #endif
+ifeq "$(DEB_HOST_ARCH)" "m68k"
+GCC_VERSION := 7
+endif
 ifneq "$(GCC_VERSION)" ""
   ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
     BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@ -720,9 +723,8 @@ ifneq "$(GCC_VERSION)" ""
       CXX=$(CC_PREFIX)g++-$(GCC_VERSION)
   endif
 endif
-
-ifeq "$(GCC_VERSION)" "6.0"
-	BUILD_DEPS += , g++-6 (>= 6-20160205)
+ifneq "$(SYSTEM_GCC_VERSION)" "7"
+BUILD_DEPS += , gcc-7 (>= 7-20170106) [m68k], g++-7 (>= 7-20170106) [m68k]
 endif
 
 BUILDDEB_OPTIONS ?= -- -Zxz
@@ -1808,7 +1810,7 @@ debian/tests/control: debian/tests/control.in debian/control
 	# for now we filter out the arch-specific libc* and ia64, which is ugly,
 	# but better than manual bookkeeping. Also filter out the mips(el)-only
 	# binutils build-dep...
-	sed -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|grep -v openjdk-6-jdk|sed -e 's/\[[^]]*\]//g'|sed -e s,\<.*\>,,g))#g" < debian/tests/control.in > debian/tests/control
+	sed -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|grep -v openjdk-6-jdk| grep -v gcc-7 | grep -v g++-7 | sed -e 's/\[[^]]*\]//g'|sed -e s,\<.*\>,,g))#g" < debian/tests/control.in > debian/tests/control
 endif
 
 .DELETE_ON_ERROR: debian/control debian/tests/control

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git