From 90be5ac750425b6ef416de5403127e940777de83 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Oct 20 2011 20:06:14 +0000
Subject: explicitly set boost libdir to workaround build failures on non-x86 64-bit arches


---

diff --git a/gnuradio-3.2.2-64bit.patch b/gnuradio-3.2.2-64bit.patch
deleted file mode 100644
index 2273518..0000000
--- a/gnuradio-3.2.2-64bit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 e4d7e2f..7610ee3 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -6,7 +6,7 @@
 
 Name:		gnuradio
 Version:	3.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -20,7 +20,6 @@ URL:		http://www.gnuradio.org
 Source0:	gnuradio-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1:	10-usrp.rules
-Patch3:		gnuradio-3.2.2-64bit.patch
 # fixed compilation with sdcc3
 Patch4:		gnuradio-3.4.0-sdcc3.patch
 # fixed detection of libusb
@@ -101,7 +100,6 @@ GNU Radio examples
 
 %prep
 %setup -q
-%patch3 -p1 -b .64bit
 %patch4 -p1 -b .sdcc3
 %patch5 -p1 -b .libusb-detect-fix
 
@@ -121,7 +119,8 @@ export PATH=%{_libexecdir}/sdcc:$PATH
 --enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \
 --enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \
 --enable-gr-sounder --enable-gr-utils --enable-gnuradio-examples \
---enable-grc --enable-docs
+--enable-grc --enable-docs \
+--with-boost-libdir=%{_libdir}
 
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -172,6 +171,9 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Thu Oct 20 2011 Dan Horák <dan[at]danny.cz> - 3.4.0-4
+- explicitly set boost libdir to workaround build failures on non-x86 64-bit arches
+
 * Thu Jul 21 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 3.4.0-3
 - Enabled volk
 - Rebuilt for new boost