diff --git a/gnuradio-3.2.2-64bit.patch b/gnuradio-3.2.2-64bit.patch new file mode 100644 index 0000000..2273518 --- /dev/null +++ b/gnuradio-3.2.2-64bit.patch @@ -0,0 +1,30 @@ +diff -up gnuradio-3.2.2/config/gr_lib64.m4.64bit gnuradio-3.2.2/config/gr_lib64.m4 +--- gnuradio-3.2.2/config/gr_lib64.m4.64bit 2010-09-07 10:50:42.000000000 +0200 ++++ gnuradio-3.2.2/config/gr_lib64.m4 2010-09-07 10:53:15.000000000 +0200 +@@ -21,14 +21,14 @@ dnl + + dnl GR_LIB64() + dnl +-dnl Checks to see if we're on a x86_64 or powerpc64 machine, and if so, determine ++dnl Checks to see if we're on a x86_64, powerpc64, sparc64 or s390x machine, and if so, determine + dnl if libdir should end in "64" or not. + dnl + dnl Sets gr_libdir_suffix to "" or "64" and calls AC_SUBST(gr_libdir_suffix) + dnl May append "64" to libdir. + dnl + dnl The current heuristic is: +-dnl if the host_cpu isn't x86_64 or powerpc64, then "" ++dnl if the host_cpu isn't x86_64 or powerpc64 or sparc64 or s390x, then "" + dnl if the host_os isn't linux, then "" + dnl if we're cross-compiling, ask the linker, by way of the selected compiler + dnl if we're x86_64 and there's a /lib64 and it's not a symlink, then "64", else "" +@@ -47,7 +47,8 @@ AC_DEFUN([GR_LIB64],[ + *) is_linux=no ;; + esac + +- if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64"; then ++ if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64" \ ++ && test "$host_cpu" != "sparc64" && test "$host_cpu" != "s390x"; then + gr_libdir_suffix="" + elif test "$cross_compiling" = yes; then + _GR_LIB64_ASK_COMPILER diff --git a/gnuradio.spec b/gnuradio.spec index 4683174..42e9126 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -14,6 +14,7 @@ Source1: 10-usrp.rules Patch0: gnuradio-3.2-libtool.patch Patch1: gnuradio-3.2-configure.patch Patch2: gnuradio-gcc45.patch +Patch3: gnuradio-3.2.2-64bit.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -99,6 +100,7 @@ GNU Radio USRP headers %patch0 -p1 -b .libtool %patch1 -p1 -b .configure %patch2 -p1 -b .gcc45 +%patch3 -p1 -b .64bit #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -205,6 +207,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Sep 07 2010 Dan HorĂ¡k - 3.2.2-8 +- Add sparc64 and s390x to 64-bit platforms + * Sun Aug 01 2010 Orcan Ogetbil - 3.2.2-7 - Fix gcc-4.5 build errors