OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jun-2007 21:18:32
Branch: HEAD Handle: 2007061720183200
Modified files:
openpkg-src/boost boost.patch boost.spec
Log:
upgrading package: boost 1.33.1 -> 1.34.0
Summary:
Revision Changes Path
1.7 +17 -12 openpkg-src/boost/boost.patch
1.13 +9 -19 openpkg-src/boost/boost.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/boost/boost.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 boost.patch
--- openpkg-src/boost/boost.patch 2 Jul 2006 17:07:42 -0000 1.6
+++ openpkg-src/boost/boost.patch 17 Jun 2007 19:18:32 -0000 1.7
@@ -1,14 +1,19 @@
-Index: tools/build/v1/boost-base.jam
---- tools/build/v1/boost-base.jam.orig 2005-07-30 17:55:37 +0200
-+++ tools/build/v1/boost-base.jam 2005-08-13 10:22:58 +0200
-@@ -2692,10 +2692,8 @@
- version-tag = $(version-tag:J="_") ;
- }
-
-- tags += $(toolset-tag:J=) ;
- tags += $(thread-tag:J=) ;
- tags += $(runtime-tag:J=) ;
-- tags += $(version-tag) ;
+Index: Jamfile.v2
+--- Jamfile.v2.orig 2007-05-11 05:40:34 +0200
++++ Jamfile.v2 2007-06-17 12:43:12 +0200
+@@ -112,12 +112,12 @@
+ default-build =
+ debug release
+ <threading>single <threading>multi
+- <link>shared <link>static
++ <link>static
+ ;
- if $(tags)
+ if [ os.name ] = NT
{
+- default-build += <runtime-link>shared <runtime-link>static ;
++ default-build += <runtime-link>static ;
+ }
+ }
+ else
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/boost/boost.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 boost.spec
--- openpkg-src/boost/boost.spec 1 Jan 2007 17:36:53 -0000 1.12
+++ openpkg-src/boost/boost.spec 17 Jun 2007 19:18:32 -0000 1.13
@@ -23,8 +23,8 @@
##
# package version
-%define V_openpkg 1.33.1
-%define V_dist 1_33_1
+%define V_openpkg 1.34.0
+%define V_dist 1_34_0
# package information
Name: boost
@@ -37,7 +37,7 @@
Group: Language
License: Boost Software License
Version: %{V_openpkg}
-Release: 20061013
+Release: 20070617
# package options
%option with_debug yes
@@ -82,25 +82,16 @@
rm -rf \
libs/python \
boost/python* \
- tools/build/v1/python.jam
-
- # accommodate platforms missing wide character support
- case "%{l_platform -t}" in
- *-freebsd4* )
- %{l_shtool} subst \
- -e 's;.*<lib>boost_wserialization.*;;' \
- libs/serialization/build/Jamfile
- ;;
- esac
+ tools/build/v2/tools/python.jam
%build
# bootstrap bjam(1), the boost build system
- ( cd tools/build/jam_src
+ ( cd tools/jam/src
./build.sh gcc
) || exit $?
# create build subdirectory, prepare to build
- ln -s tools/build/jam_src/bin.*/bjam bjam
+ ln -s tools/jam/src/bin.*/bjam bjam
mkdir obj
# configure build options for bjam(1) -sBUILD parameter
@@ -118,12 +109,11 @@
%endif
# build all libraries
- ./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts"
stage
+ ./bjam --toolset=gcc --layout=system --builddir=obj -sBUILD="$debugopts
$optimizeopts $threadopts" stage
%install
rm -rf $RPM_BUILD_ROOT
- ./bjam --prefix=$RPM_BUILD_ROOT%{l_prefix} install
- mv $RPM_BUILD_ROOT%{l_prefix}/include/boost-*/boost
$RPM_BUILD_ROOT%{l_prefix}/include
+ ./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix}
install
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/boost-*
find $RPM_BUILD_ROOT%{l_prefix}/lib/ \
-name "*.so" -print -o \
@@ -132,7 +122,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin
%{l_shtool} install -c -m 755 \
- tools/build/jam_src/bin.*/bjam \
+ tools/jam/src/bin.*/bjam \
$RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
