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.29 by elmer, Sun Nov 4 05:49:37 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.34.1-CMS18
1 > ### RPM external boost 1.34.1-CMS19
2   %define boostver _%(echo %realversion | tr . _)
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
# Line 29 | Line 29 | 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
# Line 43 | 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.v2; find libs -path "libs/*/build/gcc*/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 55 | 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)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines