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.62 by lat, Fri Jun 24 08:12:39 2011 UTC vs.
Revision 1.65 by eulisse, Thu Sep 1 08:47:30 2011 UTC

# Line 1 | Line 1
1 < ### RPM external boost 1.46.0
1 > ### RPM external boost 1.47.0
2   %define boostver _%(echo %realversion | tr . _)
3   Source: http://switch.dl.sourceforge.net/project/%{n}/%{n}/%{v}/%{n}%{boostver}.tar.gz
4   %define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
5  
6 < Requires: boost-build python bz2lib
6 > Requires: python bz2lib
7   %if "%online" != "true"
8   Requires: zlib
9   %endif
10  
11   %prep
12   %setup -n %{n}%{boostver}
13 + perl -p -i -e 's/-no-cpp-precomp//' tools/build/v2/tools/darwin.jam \
14 +                                    tools/build/v2/tools/darwin.py
15  
16   %build
17 + case %cmsos in
18 +  osx*) TOOLSET=darwin ;;
19 +  *) TOOLSET=gcc ;;
20 + esac
21 +
22 + pushd tools/build/v2
23 +
24 + sh bootstrap.sh $TOOLSET
25 + popd
26 +
27   PV="PYTHON_VERSION=$(echo $PYTHON_VERSION | sed 's/\.[0-9]*-.*$//')"
28   PR="PYTHON_ROOT=$PYTHON_ROOT"
29  
# Line 20 | Line 32 | PR="PYTHON_ROOT=$PYTHON_ROOT"
32   BZ2LIBR="BZIP2_LIBPATH=$BZ2LIB_ROOT/lib"
33   BZ2LIBI="BZIP2_INCLUDE=$BZ2LIB_ROOT/include"
34  
35 < %if "%online" != "true"
36 < ZLIBR="ZLIB_LIBPATH=$ZLIB_ROOT/lib"
37 < ZLIBI="ZLIB_INCLUDE=$ZLIB_ROOT/include"
35 > if [ ! X%online = "Xtrue" ]
36 > then
37 >  ZLIBR="ZLIB_LIBPATH=$ZLIB_ROOT/lib"
38 >  ZLIBI="ZLIB_INCLUDE=$ZLIB_ROOT/include"
39 > fi
40  
41 < case $(uname) in
28 <  Darwin )  bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR toolset=darwin stage;;
29 <  * )       bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR toolset=gcc stage;;
30 < esac
31 < %else
32 < bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$BZ2LIBI toolset=gcc stage
33 < %endif
41 > tools/build/v2/bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$BZ2LIBI ${ZLIBR+-s$ZLIBR} ${ZLIBI+-s$ZLIBI} toolset=$TOOLSET stage
42  
43   %install
44 < case $(uname) in Darwin ) so=dylib ;; * ) so=so ;; esac
44 > case %cmsos in osx*) so=dylib ;; *) so=so ;; esac
45   mkdir -p %i/lib %i/include
46   # copy files around in their final location.
47   # We use tar to reduce the number of processes required

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines