[SCM] x264/master: Do not set -fno-aggressive-loop-optimizations on sparc, which was introduced only in gcc 4.8 and the debian sparc port currently uses only gcc 4.6 (closes: #743713)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c6df5a02a37185ae1d0f4b754e9391b1161d52cd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 5 17:47:13 2014 -0400

    Do not set -fno-aggressive-loop-optimizations on sparc, which was introduced only in gcc 4.8 and the debian sparc port currently uses only gcc 4.6 (closes: #743713)

diff --git a/debian/changelog b/debian/changelog
index 6a7ea43..38d696a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x264 (2:0.142.2389+git956c8d8-4) unstable; urgency=low
+
+  * Do not set -fno-aggressive-loop-optimizations on sparc, which was
+    introduced only in gcc 4.8 and the debian sparc port currently uses
+    only gcc 4.6 (closes: #743713)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 05 Apr 2014 17:45:59 -0400
+
 x264 (2:0.142.2389+git956c8d8-3) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/confflags b/debian/confflags
index f475ff9..da7a2b0 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -18,8 +18,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	 --extra-cflags=-fno-aggressive-loop-optimizations
+common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # XXX why isn't --enable-visualize used in the static build?
 # TODO --disable-asm when we build an opt flavor?
@@ -112,6 +111,12 @@ 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))
+common_confflags += --extra-cflags=-fno-aggressive-loop-optimizations
+endif
+
 # MIPS upstream arch, mips and mipsel Debian arches; no upstream flags by
 # default
 #ifneq (,$(filter mips mipsel,$(DEB_HOST_GNU_CPU)))

-- 
x264 packaging