[SCM] x264/master: Check gcc version directly to determine whether or not -fno-aggressive-loop-optimizations should be set rather than assuming based on architecture. Closes: #745104

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bcd7b1a7a9973d328365e812b28026431ee5585e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon May 12 18:52:16 2014 -0400

    Check gcc version directly to determine whether or not  -fno-aggressive-loop-optimizations should be set rather than assuming based on architecture. Closes: #745104

diff --git a/debian/changelog b/debian/changelog
index 38d696a..3055718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+x264 (2:0.142.2389+git956c8d8-4.1) unstable; urgency=medium
+
+  [ Peter Michael Green ]
+  * Check gcc version directly to determine whether or not 
+    -fno-aggressive-loop-optimizations should be set rather than assuming based
+    on architecture. Closes: #745104
+
+  [ Reinhard Tartler ]
+  * Upload to unstable
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 12 May 2014 18:52:02 -0400
+
 x264 (2:0.142.2389+git956c8d8-4) unstable; urgency=low
 
   * Do not set -fno-aggressive-loop-optimizations on sparc, which was
diff --git a/debian/confflags b/debian/confflags
index da7a2b0..95abb94 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -111,9 +111,11 @@ shared_confflags += --disable-asm
 endif
 endif
 
-# See Bug#743713, the debian sparc port is currently stuck with gcc 4.6
-# -fno-aggressive-loop-optimizations was introduced only in gcc 4.8
-ifneq (sparc,$(DEB_HOST_GNU_CPU))
+# See Bug#743713, the debian sparc and sh4 ports are currently stuck with gcc 4.6
+#  -fno-aggressive-loop-optimizations was introduced only in gcc 4.8
+# this conditional will also help any backporters.
+HAVEGCC4.8 :=$(shell dpkg --compare-versions `gcc --version | grep ^gcc | sed 's/^.* //g'` ge 4.8 && echo yes || echo no)
+ifeq (yes,$(HAVEGCC4.8))
 common_confflags += --extra-cflags=-fno-aggressive-loop-optimizations
 endif
 

-- 
x264 packaging