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.24 by dlange, Tue Oct 9 05:11:54 2007 UTC vs.
Revision 1.27 by elmer, Fri Nov 2 21:05:17 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines