jskarvad pushed to gnuradio (f22). "Enabled uhd on ppc64 on RHEL-7 (..more)"

[notifications at fedoraproject.org]

From a4e8adb931edded9748bcc668bd8be6d36cd45a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Thu, 12 Mar 2015 14:49:59 +0100
Subject: Enabled uhd on ppc64 on RHEL-7

- Built with -j2 to speed-up the build process a bit

diff --git a/gnuradio.spec b/gnuradio.spec
index f95f99a..6f68fab 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -13,21 +13,12 @@
 %endif
 %endif
 
-# Workaround for rhbz#1128127
-%if 0%{?rhel:1}
-%ifnarch ppc64
-%global build_uhd 1
-%endif
-%else
-%global build_uhd 1
-%endif
-
 # For versions not yet on ftp, pull from git
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 Name:		gnuradio
 Version:	3.7.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -53,9 +44,7 @@ BuildRequires:	portaudio-devel, libtool, gsm-devel
 BuildRequires:	gsl-devel, tex(latex), numpy, PyQt4-devel, python-cheetah
 BuildRequires:	xdg-utils, python-lxml, pygtk2-devel, orc-devel
 BuildRequires:	dos2unix, sphinx
-%if 0%{?build_uhd}
 BuildRequires:	uhd-devel
-%endif
 %if ! 0%{?rhel:1}
 BuildRequires:	PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel
 %endif
@@ -128,7 +117,7 @@ cd build
 -DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \
 -DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \
 -DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=FORCE \
--DENABLE_GR_VOCODER=FORCE %{?build_uhd:-DENABLE_GR_UHD=FORCE} \
+-DENABLE_GR_VOCODER=FORCE -DENABLE_GR_UHD=FORCE \
 -DENABLE_GR_NOAA=FORCE -DENABLE_GR_PAGER=FORCE \
 -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \
 -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
@@ -138,9 +127,9 @@ cd build
 %{?mfpu_neon} \
 ..
 
-# make with -j1 to prevent internal compiler errors due to excessive
+# make with -j2 to prevent internal compiler errors due to excessive
 # use of resources
-make -j1 CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
+make -j2 CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 #make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
@@ -201,6 +190,10 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Thu Mar 12 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.6.1-3
+- Enabled uhd on ppc64 on RHEL-7
+- Built with -j2 to speed-up the build process a bit
+
 * Wed Mar 11 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.6.1-2
 - Enabled optional building with NEON support on aarch64
 - Built with -j1 to prevent internal compiler errors due to excessive
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnuradio.git/commit/?h=f22&id=a4e8adb931edded9748bcc668bd8be6d36cd45a3