[gnuradio] Rebuilt with -j1, otherwise the build process may fail on machines with low RAM Define changed to gl

Jaroslav Škarvada jskarvad at fedoraproject.org
Sun Jul 3 13:26:42 UTC 2011


commit 31a19f109ce89d09b3fcc4826da0f15828a80966
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Sun Jul 3 15:26:21 2011 +0200

    Rebuilt with -j1, otherwise the build process may fail on machines with low RAM
    Define changed to global

 gnuradio.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index fe6be9c..498a5d6 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -1,11 +1,12 @@
 %{!?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')}
 
 # 3.4.0 version is not yet on ftp, pull from git
-%define git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
+%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 Name:		gnuradio
 Version:	3.4.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -125,7 +126,9 @@ export PATH=%{_libexecdir}/sdcc:$PATH
 # volk disabled due to gcc-4.6 internal compiler error (#717240)
 
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+
+# make with -j1 and compile without strict-aliasing
+make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -171,6 +174,10 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Sun Jul 03 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.0-2
+- Rebuilt with -j1, otherwise the build process may fail on machines with low RAM
+- Define changed to global
+
 * Mon Jun 27 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.0-1
 - New version
 - Updated 10-usrp.rules


More information about the scm-commits mailing list