diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
commit | 730bda0e79d3e122d665663a18e0c973d7209236 (patch) | |
tree | 251b00a85c7bbc2e3ee21102c5c16c1054cf4669 /extra/boost | |
parent | cfe7b034671297c6bba5e91867d98e182c683ded (diff) | |
parent | fe769389426a6aa5a2878bf7dcfc6144717e1e93 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gcolor2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
extra/boost/PKGBUILD
extra/cdrkit/PKGBUILD
extra/ettercap/PKGBUILD
extra/lame/PKGBUILD
extra/sdl/PKGBUILD
extra/unzip/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
Diffstat (limited to 'extra/boost')
-rw-r--r-- | extra/boost/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/boost/exceptions.patch | 25 |
2 files changed, 35 insertions, 4 deletions
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 2ff1dbce0..b83dc429e 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132748 2011-07-25 19:08:12Z ibiru $ +# $Id: PKGBUILD 137203 2011-09-06 17:17:14Z andrea $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,13 +8,15 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.47.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch) license=('custom') -md5sums=('ff180a5276bec773a7625cac7e2288e8') +md5sums=('ff180a5276bec773a7625cac7e2288e8' + '9b44c28b36303152050c8c82469569c5') _stagedir="${srcdir}/stagedir" @@ -25,6 +27,10 @@ build() { echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam echo "using mpi ;" >> build/v2/user-config.jam + # http://web.archiveorange.com/archive/v/Q0J4VE5bwsy3zxRXqUgd + cd "${srcdir}"/${pkgbase}_${_boostver} + patch -p0 -i "${srcdir}"/exceptions.patch + # build bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" ./build.sh cc diff --git a/extra/boost/exceptions.patch b/extra/boost/exceptions.patch new file mode 100644 index 000000000..9faa71526 --- /dev/null +++ b/extra/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 |