ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/boost.spec
(Generate patch)

Comparing COMP/CMSDIST/boost.spec (file contents):
Revision 1.45 by muzaffar, Thu Jun 18 16:02:47 2009 UTC vs.
Revision 1.49 by lat, Sat Oct 31 21:48:38 2009 UTC

# Line 1 | Line 1
1 < ### RPM external boost 1.38.0
1 > ### RPM external boost 1.40.0
2   %define boostver _%(echo %realversion | tr . _)
3   Source: http://internap.dl.sourceforge.net/sourceforge/%{n}/%{n}%{boostver}.tar.gz
4 < %define online %(case %cmsplatf in *onl_*_*) echo true ;; esac)
4 > %define closingbrace )
5 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
6  
7   Requires: boost-build python bz2lib
8   %if "%online" != "true"
# Line 76 | Line 77 | done
77  
78   getLibName()
79   {
80 <  libname=`find %i/lib -name "libboost_$1*mt*.$so" -exec basename {} \;`
80 >  libname=`find %i/lib -name "libboost_$1.$so" -exec basename {} \;`
81    echo $libname | sed -e 's|[.][^-]*$||;s|^lib||'
82   }
83  
# Line 87 | Line 88 | export BOOST_SYSTEM_LIB=`getLibName syst
88   export BOOST_PROGRAM_OPTIONS_LIB=`getLibName program_options`
89   export BOOST_PYTHON_LIB=`getLibName python`
90   export BOOST_REGEX_LIB=`getLibName regex`
91 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
92  
93   # SCRAM ToolBox toolfile
94   mkdir -p %i/etc/scram.d
# Line 147 | Line 149 | cat << \EOF_TOOLFILE >%i/etc/scram.d/boo
149   <lib name="@BOOST_PYTHON_LIB@">
150   <Client>
151   <Environment name=BOOST_PYTHON_BASE default="%i"></Environment>
152 < <Environment name=PYSTE_EXEC default="$BOOST_PYTHON_BASE/lib/python2.4/site-packages/Pyste/pyste.py"></Environment>
152 > <Environment name=PYSTE_EXEC default="$BOOST_PYTHON_BASE/lib/python@PYTHONV@/site-packages/Pyste/pyste.py"></Environment>
153   <Environment name=LIBDIR default="$BOOST_PYTHON_BASE/lib"></Environment>
154   <Environment name=INCLUDE default="$BOOST_PYTHON_BASE/include"></Environment>
155   </Client>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines