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.22 by dlange, Sun Sep 16 20:30:06 2007 UTC vs.
Revision 1.28 by elmer, Fri Nov 2 22:21:10 2007 UTC

# Line 1 | Line 1
1 < ### RPM external boost 1.33.1-CMS9
2 < # Patches and build fudging by Lassi A. Tuura <lat@iki.fi> (FIXME: contribute to boost)
1 > ### RPM external boost 1.34.1-CMS18
2   %define boostver _%(echo %realversion | tr . _)
3 < Requires: boost-build python bz2lib zlib
4 < Source: http://dl.sourceforge.net/sourceforge/%n/%{n}%{boostver}.tar.gz
3 > Source: http://internap.dl.sourceforge.net/sourceforge/%{n}/%{n}%{boostver}.tar.gz
4 >
5 > Requires: boost-build python bz2lib
6 > %if "%{?online_release:set}" != "set"
7 > Requires: zlib
8 > %endif
9  
10   %prep
11   %setup -n %{n}%{boostver}
# Line 12 | Line 15 | Source: http://dl.sourceforge.net/source
15   # missing symbols), causing darwin to fail to link and bjam to return
16   # an error.  So ignore the exit code from bjam on darwin to avoid
17   # RPM falsely detecting a problem.
18 + PV="PYTHON_VERSION=$(echo $PYTHON_VERSION | sed 's/\.[0-9]*-.*$//')"
19   PR="PYTHON_ROOT=$PYTHON_ROOT"
20 < #PV="PYTHON_VERSION=$(echo $PYTHON_VERSION | sed 's/\.[0-9]*$//')"
20 >
21   # The following line assumes a version of the form x.y.z-XXXX, where the
22   # "-XXXX" part represents some CMS rebuild of version x.y.z
19 PV="PYTHON_VERSION=$(echo $PYTHON_VERSION | sed 's/\.[0-9]*-.*$//')"
23   BZ2LIBR="BZIP2_LIBPATH=$BZ2LIB_ROOT/lib"
21 ZLIBR="ZLIB_LIBPATH=$ZLIB_ROOT/lib"
24   BZ2LIBI="BZIP2_INCLUDE=$BZ2LIB_ROOT/include"
25 +
26 + %if "%{?online_release:set}" != "set"
27 + ZLIBR="ZLIB_LIBPATH=$ZLIB_ROOT/lib"
28   ZLIBI="ZLIB_INCLUDE=$ZLIB_ROOT/include"
29  
30   case $(uname) in
31    Darwin )  bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR -sTOOLS=darwin || true ;;
32    * )       bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR -sTOOLS=gcc ;;
33   esac
34 + %else
35 + bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$BZ2LIBI -sTOOLS=gcc
36 + %endif
37  
38   %install
39   boost_abi=$(echo %boostver | sed 's/^_//; s/_0$//')

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines