[gnuradio] explicitly set boost libdir to workaround build failures on non-x86 64-bit arches

Dan Horák sharkcz at fedoraproject.org
Thu Oct 20 20:06:18 UTC 2011


commit 90be5ac750425b6ef416de5403127e940777de83
Author: Dan Horák <dan at danny.cz>
Date:   Thu Oct 20 22:06:14 2011 +0200

    explicitly set boost libdir to workaround build failures on non-x86 64-bit arches

 gnuradio-3.2.2-64bit.patch |   30 ------------------------------
 gnuradio.spec              |   10 ++++++----
 2 files changed, 6 insertions(+), 34 deletions(-)
---
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 at redhat.com> - 3.4.0-3
 - Enabled volk
 - Rebuilt for new boost


More information about the scm-commits mailing list