From 92ea364a79bdfdcc47876f2ea559fb95236389a5 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Sep 05 2012 08:49:41 +0000
Subject: Added conditional for ARM NEON build (%bcond_with neon)


---

diff --git a/gnuradio.spec b/gnuradio.spec
index dd308af..509fc65 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -1,9 +1,17 @@
+# NEON support is by default disabled on ARMs
+%bcond_with neon
+
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %{?_smp_mflags: %global my_smp_mflags %(echo "%{_smp_mflags}" | sed 's/-j[0-9]\\+/-j1/g')}
 
-# For now disable NEON on all ARMs
 %ifarch %{arm}
-%global disable_mfpu_neon -Dhave_mfpu_neon=0
+%if %{with neon}
+%global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon")
+%{expand: %global optflags %{my_optflags}}
+%global mfpu_neon -Dhave_mfpu_neon=1
+%else
+%global mfpu_neon -Dhave_mfpu_neon=0
+%endif
 %endif
 
 # For versions not yet on ftp, pull from git
@@ -14,7 +22,7 @@
 
 Name:		gnuradio
 Version:	3.6.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -124,7 +132,7 @@ cd build
 -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \
 -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
 -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
-%{?disable_mfpu_neon} \
+%{?mfpu_neon} \
 ..
 
 # make with -j1 and compile without strict-aliasing
@@ -175,6 +183,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Wed Aug 29 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.1-6
+- Added conditional for ARM NEON build (%%bcond_with neon)
+
 * Fri Aug 10 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.1-5
 - Rebuilt for new boost