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.43 by eulisse, Mon Feb 16 18:45:22 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 closingbrace )
5 + %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
6  
7   Requires: boost-build python bz2lib
8 < %if "%cmsplatf" == "slc4onl_ia32_gcc346"
7 < %else
8 > %if "%online" != "true"
9   Requires: zlib
10   %endif
11  
# Line 24 | Line 25 | PR="PYTHON_ROOT=$PYTHON_ROOT"
25   BZ2LIBR="BZIP2_LIBPATH=$BZ2LIB_ROOT/lib"
26   BZ2LIBI="BZIP2_INCLUDE=$BZ2LIB_ROOT/include"
27  
28 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
28 > %if "%online" != "true"
29   ZLIBR="ZLIB_LIBPATH=$ZLIB_ROOT/lib"
30   ZLIBI="ZLIB_INCLUDE=$ZLIB_ROOT/include"
31  
# 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  
84   export BOOST_THREAD_LIB=`getLibName thread`
85   export BOOST_SIGNALS_LIB=`getLibName signals`
86   export BOOST_FILESYSTEM_LIB=`getLibName filesystem`
87 + export BOOST_SYSTEM_LIB=`getLibName system`
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 113 | Line 116 | cat << \EOF_TOOLFILE >%i/etc/scram.d/boo
116   <Tool name=boost_filesystem version=%v>
117   <info url="http://www.boost.org"></info>
118   <lib name="@BOOST_FILESYSTEM_LIB@">
119 + <use name=boost_system>
120 + <use name=boost>
121 + </Tool>
122 + EOF_TOOLFILE
123 +
124 + # boost_system toolfile
125 + cat << \EOF_TOOLFILE >%i/etc/scram.d/boost_system
126 + <doc type=BuildSystem::ToolDoc version=1.0>
127 + <Tool name=boost_system version=%v>
128 + <info url="http://www.boost.org"></info>
129 + <lib name="@BOOST_SYSTEM_LIB@">
130   <use name=boost>
131   </Tool>
132   EOF_TOOLFILE
# Line 135 | 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