[libreoffice] 02/04: Drop references to gcc < 4.7

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit cf1814a876ffdbaf4c825c68269b01eac990085b
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sun Aug 6 21:56:49 2017 +0200

    Drop references to gcc < 4.7
---
 rules | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/rules b/rules
index 527cc61..f91368f 100755
--- a/rules
+++ b/rules
@@ -766,13 +766,6 @@ ifeq "$(USE_CLANG)" "y"
 endif
 
 ifneq "$(USE_CLANG)" "y"
-#  ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
-#    ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
-#      ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
-#	GCC_VERSION := 4.6
-#      endif
-#    endif
-#  endif
   ifneq "$(GCC_VERSION)" ""
   ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
     BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@ -1867,10 +1860,6 @@ ifeq "$(MYSQL_FLAVOUR)" "mysql"
 	perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
 endif
 
-ifeq (4.4,$(SYSTEM_GCC_VERSION))
-	perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
-endif
-
 	$(PYTHON) debian/scripts/joinctrl.py < debian/control > debian/control.tmp
 	mv debian/control.tmp debian/control
 

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