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.23 by elmer, Fri Sep 21 21:05:54 2007 UTC vs.
Revision 1.33 by elmer, Mon Dec 31 18:07:11 2007 UTC

# Line 1 | Line 1
1 < ### RPM external boost 1.33.1-CMS3q
2 < # Patches and build fudging by Lassi A. Tuura <lat@iki.fi> (FIXME: contribute to boost)
1 > ### RPM external boost 1.34.1-CMS19
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 > %define gccver %(echo $GCC_VERSION | cut -d. -f1,2 | sed -e 's/\.//')
4 > Source: http://internap.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}
# 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 ;;
32 >  Darwin )  bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR -sTOOLS=darwin --toolset=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$//')
# Line 34 | Line 43 | case $(uname) in Darwin ) so=dylib ;; *
43   #mkdir -p %i/lib/debug
44   mkdir %i/lib
45   #(cd bin/boost; find libs -path "libs/*/debug/*.$so" -exec cp {} %i/lib/debug \;)
46 < (cd bin/boost; find libs -path "libs/*/release/*.$so" -exec cp  {} %i/lib/. \;)
46 > # Perhaps the following could be done with a wildcard for the darwin/gcc dir
47 > case $(uname) in
48 >  Darwin )
49 >    (cd bin.v2; find libs -path "libs/*/build/darwin*/release/*.$so*" -exec cp  {} %i/lib/. \;)
50 >    ;;
51 >   * )
52 >    (cd bin.v2; find libs -path "libs/*/build/gcc*/release/*.$so*" -exec cp  {} %i/lib/. \;)
53 >    ;;
54 > esac
55   find boost -name '*.[hi]*' -print |
56    while read f; do
57      mkdir -p %i/include/$(dirname $f)
# Line 46 | Line 63 | find libs -name '*.py' -print |
63      install -c $f %i/lib/$f
64    done
65   [ $(uname) = Darwin ] &&
66 <  for f in %i/lib/*.$so %i/lib/debug/*.$so; do
66 >  for f in %i/lib/*.$so %i/lib/*.$so; do
67      install_name_tool -id $f $f
68    done
69  
70   # Do all manipulation with files before creating symbolic links:
71   perl -p -i -e "s|^#!.*python|/usr/bin/env python|" $(find %{i}/lib %{i}/bin)
72 < strip %i/lib/*.$so
72 > #strip %i/lib/*.$so
73 >
74  
75 < (cd %i/lib; for f in lib*-$boost_abi.$so; do ln -s $f $(echo $f | sed "s/-$boost_abi//"); done)
76 < (cd %i/lib; for f in lib*-$boost_abi.$so; do ln -s $f $f.%realversion ; done)
75 > #(cd %i/lib; for f in lib*-$boost_abi.$so; do ln -s $f $(echo $f | sed "s/-$boost_abi//"); done)
76 > #(cd %i/lib; for f in lib*-$boost_abi.$so; do ln -s $f $f.%realversion ; done)
77 > (cd %i/lib; for f in lib*-$boost_abi.$so.%{realversion}; do ln -s $f $(echo $f | sed "s/.%{realversion}$//"); done)
78 > (cd %i/lib; for f in lib*-$boost_abi.$so.%{realversion}; do ln -s $f $(echo $f | sed "s/-$boost_abi//" | sed "s/.%{realversion}$//"); done)
79 > (cd %i/lib; for f in lib*-$boost_abi.$so.%{realversion}; do ln -s $f $(echo $f | sed "s/-$boost_abi//" | sed "s/.%{realversion}$//" | sed "s/gcc%{gccver}/gcc/"); done)
80   #(cd %i/lib/debug; for f in lib*-d-$boost_abi.$so; do ln -s $f $(echo $f | sed "s/-d-$boost_abi//"); done)
81   #(cd %i/lib/debug; for f in lib*-d-$boost_abi.$so; do ln -s $f $f.%realversion; done)
82   (cd %i/lib/libs/python/pyste/install; python setup.py install --prefix=%i)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines