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.21 by muzaffar, Mon Sep 3 15:28:45 2007 UTC vs.
Revision 1.37 by ratnik, Tue May 13 17:07:02 2008 UTC

# Line 1 | Line 1
1 < ### RPM external boost 1.33.1-CMS8
2 < # Patches and build fudging by Lassi A. Tuura <lat@iki.fi> (FIXME: contribute to boost)
1 > ### RPM external boost 1.34.1-CMS21
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 "%cmsplatf" != "slc4onl_ia32_gcc346"
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 "%cmsplatf" != "slc4onl_ia32_gcc346"
27 + ZLIBR="ZLIB_LIBPATH=$ZLIB_ROOT/lib"
28   ZLIBI="ZLIB_INCLUDE=$ZLIB_ROOT/include"
29  
30   case $(uname) in
31 <  Darwin )  bjam -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR -sTOOLS=darwin || true ;;
32 <  * )       bjam -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR -sTOOLS=gcc ;;
31 >  Darwin )  bjam %makeprocesses -s$PR -s$PV -s$BZ2LIBR -s$ZLIBR -sTOOLS=darwin --toolset=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 +
40 + linkgccver=%(echo %gccver | tr -d . | perl -pe 's/^(\d\d).*/$1/')
41 +
42   boost_abi=$(echo %boostver | sed 's/^_//; s/_0$//')
43   case $(uname) in Darwin ) so=dylib ;; * ) so=so ;; esac
44   #no debug libs...
45   #mkdir -p %i/lib/debug
46   mkdir %i/lib
47   #(cd bin/boost; find libs -path "libs/*/debug/*.$so" -exec cp {} %i/lib/debug \;)
48 < (cd bin/boost; find libs -path "libs/*/release/*.$so" -exec cp  {} %i/lib/. \;)
48 > # Perhaps the following could be done with a wildcard for the darwin/gcc dir
49 > case $(uname) in
50 >  Darwin )
51 >    (cd bin.v2; find libs -path "libs/*/build/darwin*/release/*.$so*" -exec cp  {} %i/lib/. \;)
52 >    ;;
53 >   * )
54 >    (cd bin.v2; find libs -path "libs/*/build/gcc*/release/*.$so*" -exec cp  {} %i/lib/. \;)
55 >    ;;
56 > esac
57   find boost -name '*.[hi]*' -print |
58    while read f; do
59      mkdir -p %i/include/$(dirname $f)
# Line 46 | Line 65 | find libs -name '*.py' -print |
65      install -c $f %i/lib/$f
66    done
67   [ $(uname) = Darwin ] &&
68 <  for f in %i/lib/*.$so %i/lib/debug/*.$so; do
68 >  for f in %i/lib/*.$so %i/lib/*.$so; do
69      install_name_tool -id $f $f
70    done
71  
72   # Do all manipulation with files before creating symbolic links:
73   perl -p -i -e "s|^#!.*python|/usr/bin/env python|" $(find %{i}/lib %{i}/bin)
74 < strip %i/lib/*.$so
74 > #strip %i/lib/*.$so
75 >
76  
77 < (cd %i/lib; for f in lib*-$boost_abi.$so; do ln -s $f $(echo $f | sed "s/-$boost_abi//"); done)
78 < (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; do ln -s $f $(echo $f | sed "s/-$boost_abi//"); done)
78 > #(cd %i/lib; for f in lib*-$boost_abi.$so; do ln -s $f $f.%realversion ; done)
79 > (cd %i/lib; for f in lib*-$boost_abi.$so.%{realversion}; do ln -s $f $(echo $f | sed "s/.%{realversion}$//"); done)
80 > (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)
81 > (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$linkgccver/gcc/"); done)
82   #(cd %i/lib/debug; for f in lib*-d-$boost_abi.$so; do ln -s $f $(echo $f | sed "s/-d-$boost_abi//"); done)
83   #(cd %i/lib/debug; for f in lib*-d-$boost_abi.$so; do ln -s $f $f.%realversion; done)
84   (cd %i/lib/libs/python/pyste/install; python setup.py install --prefix=%i)
# Line 75 | Line 98 | cat << \EOF_TOOLFILE >%i/etc/scram.d/boo
98   <Environment name=INCLUDE default="$BOOST_BASE/include"></Environment>
99   </Client>
100   <use name=sockets>
101 + <Runtime name=LD_LIBRARY_PATH value="$BOOST_BASE/lib" type=path>
102 + <Runtime name=CMSSW_FWLITE_INCLUDE_PATH value="$BOOST_BASE/include" type=path>
103   </Tool>
104   EOF_TOOLFILE
105  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines