From d7e17076e764d21a3f2210df6fc8611470086a19 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 2 Jul 2012 16:30:25 +0200 Subject: [PATCH] boost: update to 1.50.0. --- common/shlibs | 42 ++++++++++++++--------------- srcpkgs/boost/boost-build.template | 11 +++----- srcpkgs/boost/boost-jam.template | 4 +-- srcpkgs/boost/boost-python.template | 7 ++--- srcpkgs/boost/template | 41 +++++++++++++--------------- 5 files changed, 46 insertions(+), 59 deletions(-) diff --git a/common/shlibs b/common/shlibs index fa049bb1b0..a763f8addb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -534,27 +534,27 @@ libnm-util.so.2 libnm-0.9.1.90_1 libnm-glib.so.4 libnm-0.9.1.90_1 libnm-glib-vpn.so.1 libnm-0.9.1.90_1 libpanel-applet-4.so.0 gnome-panel-3.3.92_1 -libboost_date_time.so.1.44.0 boost-1.44<1.45_1 -libboost_math_tr1f.so.1.44.0 boost-1.44<1.45_1 -libboost_serialization.so.1.44.0 boost-1.44<1.45_1 -libboost_filesystem.so.1.44.0 boost-1.44<1.45_1 -libboost_math_tr1l.so.1.44.0 boost-1.44<1.45_1 -libboost_signals.so.1.44.0 boost-1.44<1.45_1 -libboost_graph.so.1.44.0 boost-1.44<1.45_1 -libboost_math_tr1.so.1.44.0 boost-1.44<1.45_1 -libboost_system.so.1.44.0 boost-1.44<1.45_1 -libboost_iostreams.so.1.44.0 boost-1.44<1.45_1 -libboost_prg_exec_monitor.so.1.44.0 boost-1.44<1.45_1 -libboost_thread.so.1.44.0 boost-1.44<1.45_1 -libboost_math_c99f.so.1.44.0 boost-1.44<1.45_1 -libboost_program_options.so.1.44.0 boost-1.44<1.45_1 -libboost_unit_test_framework.so.1.44.0 boost-1.44<1.45_1 -libboost_math_c99l.so.1.44.0 boost-1.44<1.45_1 -libboost_python.so.1.44.0 boost-python-1.44<1.45_1 -libboost_wave.so.1.44.0 boost-1.44<1.45_1 -libboost_math_c99.so.1.44.0 boost-1.44<1.45_1 -libboost_regex.so.1.44.0 boost-1.44<1.45_1 -libboost_wserialization.so.1.44.0 boost-1.44<1.45_1 +libboost_date_time.so.1.50.0 boost-1.50<1.51_1 +libboost_math_tr1f.so.1.50.0 boost-1.50<1.51_1 +libboost_serialization.so.1.50.0 boost-1.50<1.51_1 +libboost_filesystem.so.1.50.0 boost-1.50<1.51_1 +libboost_math_tr1l.so.1.50.0 boost-1.50<1.51_1 +libboost_signals.so.1.50.0 boost-1.50<1.51_1 +libboost_graph.so.1.50.0 boost-1.50<1.51_1 +libboost_math_tr1.so.1.50.0 boost-1.50<1.51_1 +libboost_system.so.1.50.0 boost-1.50<1.51_1 +libboost_iostreams.so.1.50.0 boost-1.50<1.51_1 +libboost_prg_exec_monitor.so.1.50.0 boost-1.50<1.51_1 +libboost_thread.so.1.50.0 boost-1.50<1.51_1 +libboost_math_c99f.so.1.50.0 boost-1.50<1.51_1 +libboost_program_options.so.1.50.0 boost-1.50<1.51_1 +libboost_unit_test_framework.so.1.50.0 boost-1.50<1.51_1 +libboost_math_c99l.so.1.50.0 boost-1.50<1.51_1 +libboost_python.so.1.50.0 boost-python-1.44<1.51_1 +libboost_wave.so.1.50.0 boost-1.50<1.51_1 +libboost_math_c99.so.1.50.0 boost-1.50<1.51_1 +libboost_regex.so.1.50.0 boost-1.50<1.51_1 +libboost_wserialization.so.1.50.0 boost-1.50<1.51_1 libexempi.so.3 exempi-2.1.1_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2.so.2 libsgutils-1.28_1 diff --git a/srcpkgs/boost/boost-build.template b/srcpkgs/boost/boost-build.template index f1867a5b06..339d692ebb 100644 --- a/srcpkgs/boost/boost-build.template +++ b/srcpkgs/boost/boost-build.template @@ -1,6 +1,8 @@ # Template file for 'boost-build'. # -depends="boost-jam boost-devel" +conf_files="/etc/site-config.jam" +noarch=yes +depends="boost-jam>=$version boost-devel>=$version" short_desc="${short_desc} (Boost.Build framework)" long_desc=" Boost is a set of free, peer-reviewed, C++ libraries. The emphasis is on @@ -9,12 +11,7 @@ long_desc=" This package provides the Boost.Build module, which includes bjam. This is the tool used to build Boost itself, and is based on Perforce Jam." -conf_files="/etc/site-config.jam" -noarch=yes - - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/share mv ${SRCPKGDESTDIR}/usr/share/boost-build ${DESTDIR}/usr/share mv ${SRCPKGDESTDIR}/etc ${DESTDIR} diff --git a/srcpkgs/boost/boost-jam.template b/srcpkgs/boost/boost-jam.template index ce0bd41274..23bcf836a8 100644 --- a/srcpkgs/boost/boost-jam.template +++ b/srcpkgs/boost/boost-jam.template @@ -8,9 +8,7 @@ long_desc=" This package provides the Boost.Jam module, a make-like utility. This is the tool used to build Boost itself, and is based on Perforce Jam." - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/bin mv ${SRCPKGDESTDIR}/usr/bin/bjam ${DESTDIR}/usr/bin } diff --git a/srcpkgs/boost/boost-python.template b/srcpkgs/boost/boost-python.template index f164dcc543..0b3c67f41f 100644 --- a/srcpkgs/boost/boost-python.template +++ b/srcpkgs/boost/boost-python.template @@ -1,6 +1,6 @@ # Template file for 'boost-python'. # -depends="boost python" +depends="boost>=$version python" short_desc="${short_desc} - python bindings" long_desc=" Boost is a set of free, peer-reviewed, C++ libraries. The emphasis is on @@ -9,10 +9,7 @@ long_desc=" This package adds static and shared binary libraries providing support for the Boost Python library." - - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libboost_python* ${DESTDIR}/usr/lib } diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index fd06512d6f..a6b4064c40 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,52 +1,47 @@ # Template file for 'boost' pkgname=boost -version=1.44.0 -revision=3 +version=1.50.0 +revision=1 _boostver="$(echo $version|sed 's|\.|_|g')" -wrksrc=${pkgname}_${_boostver} -distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2" +wrksrc="${pkgname}_${_boostver}" +subpackages="boost-build boost-devel boost-jam boost-python" makedepends="zlib-devel icu-devel python-devel" short_desc="Free peer-reviewed portable C++ source libraries" maintainer="Juan RP " -checksum=45c328029d97d1f1dc7ff8c9527cd0c5cc356636084a800bca2ee4bfab1978db +homepage="http://www.boost.org/" +license="Boost Software License 1.0" +distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2" +checksum=c9ace2b8c81fa6703d1d17c7e478de3bc51101c5adbdeb3f6cb72cf3045a8529 long_desc=" boost is a library for applications dealing with netlink sockets. The library provides an interface for raw netlink messaging and various netlink family specific interfaces." -subpackages="boost-build boost-devel boost-jam boost-python" - -do_build() -{ - cd ${wrksrc} && ./bootstrap.sh -prefix=${DESTDIR}/usr || return 1 - cd ${wrksrc} && ./bjam cflags=-fno-strict-aliasing ${makejobs} || return 1 +do_build() { + ./bootstrap.sh -prefix=${DESTDIR}/usr + ./bjam cflags=-fno-strict-aliasing ${makejobs} } -do_install() -{ +do_install() { # Install bjam _bindir="bin.linuxx86" [ "${XBPS_MACHINE}" = "x86_64" ] && _bindir="bin.linuxx86_64" - install -m755 -d ${DESTDIR}/usr/bin - install -m755 ${wrksrc}/tools/jam/src/${_bindir}/bjam \ - ${DESTDIR}/usr/bin || return 1 + vinstall bjam 755 usr/bin # Install headers/libs - cd ${wrksrc} && ./bjam --prefix=${DESTDIR}/usr install || return 1 + ./bjam --prefix=${DESTDIR}/usr install # Install Boost.Build stuff. install -d ${DESTDIR}/usr/share/boost-build - cd ${wrksrc}/tools/build/v2 && cp -a . ${DESTDIR}/usr/share/boost-build + cd $wrksrc/tools/build/v2 && cp -a . ${DESTDIR}/usr/share/boost-build find ${DESTDIR}/usr/share/boost-build \ -type f -name \*.orig -exec rm -f {} \; ( echo '# System wide configuration file for Boost.Build.' ; \ echo ; \ echo 'using gcc ;' ; ) >${wrksrc}/site-config.jam - install -m644 -D ${wrksrc}/site-config.jam \ - ${DESTDIR}/etc/site-config.jam + cd $wrksrc + vinstall site-config.jam 644 etc # license - install -d ${DESTDIR}/usr/share/licenses/${pkgname} - install -m644 ${wrksrc}/LICENSE_1_0.txt \ - ${DESTDIR}/usr/share/licenses/${pkgname}/ || return 1 + vinstall LICENSE_1_0.txt 644 usr/share/licenses/boost }