From c4496b004f0af766a29348e0e5c273daee66a6da Mon Sep 17 00:00:00 2001
From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Fri, 9 Oct 2009 08:26:49 +0000
Subject: [PATCH] build our stuff right away

---
 devel.pkgs         |  5 ++++-
 wextoolbox-tags.mk |  4 ++--
 wextoolbox.mk      | 42 +++++++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/devel.pkgs b/devel.pkgs
index 33dd8ba..bed0f62 100644
--- a/devel.pkgs
+++ b/devel.pkgs
@@ -98,6 +98,9 @@ package: libxml2-python libxslt-python
 
 ########## for boost
 package: bzip2-devel libicu-devel chrpath
-########## for gnuradio - we use our local boost, this is in gnuradio-DEPEND-DEVEL-RPMS in the makefile
+########## for gnuradio 
+# we use our local boost, see gnuradio-DEPEND-DEVEL-RPMS in the makefile
+# again, with f11 we could use the stock boost rpm
+# package: boost-devel
 package: python-numeric PyQt4 swig fftw sdcc gsl guile cppunit 
 package: fftw-devel gsl-devel libusb-devel cppunit-devel
diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index 159acaa..b1d7350 100644
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -2,11 +2,11 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
+boost-SVNPATH			:= http://svn.onelab.eu/boost/trunk
+gnuradio-SVNPATH		:= http://svn.onelab.eu/gnuradio/trunk
 # trying the 2.6.27 kernel
 linux-2.6-SVNPATH               := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH			:= http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0
-boost-SVNPATH			:= http://svn.onelab.eu/boost/trunk
-gnuradio-SVNPATH		:= http://svn.onelab.eu/gnuradio/trunk
 util-vserver-SVNBRANCH		:= scholz
 util-vserver-SVNPATH		:= http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH			:= http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
diff --git a/wextoolbox.mk b/wextoolbox.mk
index 3e6405c..f2fbd05 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -22,6 +22,29 @@
 # see doc in Makefile  
 #
 
+#
+# boost
+# 
+# we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
+# this build is based on the f11 rpm, i.e. boost-1.37
+#
+boost-MODULES := boost
+boost-SPEC := boost.spec
+boost-BUILD-FROM-SRPM := yes
+ALL += boost
+IN_BOOTSTRAPFS += boost
+
+#
+# gnuradio
+#
+gnuradio-MODULES := gnuradio
+gnuradio-SPEC := gnuradio.spec
+gnuradio-BUILD-FROM-SRPM := yes
+# boost-devel needs boost !
+gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
+ALL += gnuradio
+IN_BOOTSTRAPFS += gnuradio
+
 #
 # kernel
 #
@@ -67,25 +90,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# boost
-#
-boost-MODULES := boost
-boost-SPEC := boost.spec
-boost-BUILD-FROM-SRPM := yes
-ALL += boost
-IN_BOOTSTRAPFS += boost
-
-#
-# gnuradio
-#
-gnuradio-MODULES := gnuradio
-gnuradio-SPEC := gnuradio.spec
-gnuradio-BUILD-FROM-SRPM := yes
-gnuradio-DEPEND-DEVEL-RPMS := boost-devel
-ALL += gnuradio
-IN_BOOTSTRAPFS += gnuradio
-
 #
 # util-vserver
 #
-- 
2.43.0