From 7b19951c08b6816e8e36a91e9faaed20baa91106 Mon Sep 17 00:00:00 2001 From: ibrahimkaraguzel Date: Sun, 27 Mar 2016 18:56:57 +0300 Subject: [PATCH] boost: version bump, rebuilt with docker --- programming/misc/boost/actions.py | 5 +- .../misc/boost/files/cuda_float128.patch | 54 ++++++++++ programming/misc/boost/pspec.xml | 98 +++++++++++++++++-- 3 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 programming/misc/boost/files/cuda_float128.patch diff --git a/programming/misc/boost/actions.py b/programming/misc/boost/actions.py index c9a7aa4f96..2a3abb42f4 100644 --- a/programming/misc/boost/actions.py +++ b/programming/misc/boost/actions.py @@ -10,7 +10,8 @@ from pisi.actionsapi import shelltools def setup(): shelltools.system("./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2.7 --prefix=%s/usr" % get.installDIR()) - #shelltools.echo("project-config.jam","using mpi ;") + + shelltools.echo("project-config.jam","using python : 3.4 : /usr/bin/python3 : /usr/include/python3.4m : /usr/lib ;") #shelltools.echo("project-config.jam","--without-mpi ;") def build(): @@ -30,4 +31,4 @@ def install(): pisitools.dobin("bjam") shelltools.copytree("tools/boostbook/xsl", "%s/usr/share/boostbook/xsl" % get.installDIR()) shelltools.copytree("tools/boostbook/dtd", "%s/usr/share/boostbook" % get.installDIR()) - shelltools.system("./b2 install threading=multi link=shared") \ No newline at end of file + shelltools.system("./b2 install threading=multi link=shared") diff --git a/programming/misc/boost/files/cuda_float128.patch b/programming/misc/boost/files/cuda_float128.patch new file mode 100644 index 0000000000..fe3a3301a8 --- /dev/null +++ b/programming/misc/boost/files/cuda_float128.patch @@ -0,0 +1,54 @@ +From a332112317450457c715675686386ec81214b863 Mon Sep 17 00:00:00 2001 +From: Axel Huebl +Date: Fri, 18 Dec 2015 10:27:04 +0100 +Subject: [PATCH] Fix Trac 11852: GCC & CUDA __float128 + +Fix trac issue + https://svn.boost.org/trac/boost/ticket/11852 + +Similar to + https://svn.boost.org/trac/boost/ticket/8048 + +`__float128` is still unsupported when compiling with nvcc +(tested with `CUDA 7.5.18`). First noticed with the latest +release (`1.60.0`) and `GCC 4.8.5` but should affect all +previous releases depending on used modules. + +In my case, I triggered it with the components + `program_options regex filesystem system thread math_tr1` +enabled . +--- + include/boost/config/compiler/gcc.hpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp +index d9dd59d..8683dbd 100644 +--- a/include/boost/config/compiler/gcc.hpp ++++ b/include/boost/config/compiler/gcc.hpp +@@ -134,7 +134,7 @@ + // Recent GCC versions have __int128 when in 64-bit mode. + // + // We disable this if the compiler is really nvcc as it +-// doesn't actually support __int128 as of CUDA_VERSION=5000 ++// doesn't actually support __int128 as of CUDA_VERSION=7500 + // even though it defines __SIZEOF_INT128__. + // See https://svn.boost.org/trac/boost/ticket/8048 + // Only re-enable this for nvcc if you're absolutely sure +@@ -148,12 +148,16 @@ + // include a std lib header to detect this - not ideal, but we'll + // be including later anyway when we select the std lib. + // ++// Nevertheless, as of CUDA 7.5, using __float128 with the host ++// compiler is still not supported. ++// See https://svn.boost.org/trac/boost/ticket/11852 ++// + #ifdef __cplusplus + #include + #else + #include + #endif +-#if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__) ++#if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(__CUDACC__) + # define BOOST_HAS_FLOAT128 + #endif + diff --git a/programming/misc/boost/pspec.xml b/programming/misc/boost/pspec.xml index da33d28365..9f3c6ef4f0 100644 --- a/programming/misc/boost/pspec.xml +++ b/programming/misc/boost/pspec.xml @@ -1,4 +1,3 @@ - @@ -14,27 +13,28 @@ library Peer-reviewed portable C++ source libraries Boost provides free portable peer-reviewed C++ libraries. The emphasis is on portable libraries which work well with the C++ Standard Library. - mirrors://sourceforge/boost/boost_1_58_0.tar.bz2 + mirrors://sourceforge/boost/boost_1_60_0.tar.bz2 - icu4c-devel - zlib-devel - python-devel bzip2 + zlib-devel + icu4c-devel + python-devel + python3-devel libxslt - boost-1.58.0-Fix-for-bind-void-mf-ambiguous-resolution-error.patch + cuda_float128.patch boost - icu4c zlib bzip2 + icu4c libgcc @@ -58,14 +58,94 @@ /usr/share/doc/*/html + + + boost-python + a C++ library which enables seamless interoperability between C++ and the Python + + boost + libgcc + + + /usr/lib/libboost_python.so* + + + + + boost-python3 + Headers and library documentation for boosta C++ library which enables seamless interoperability between C++ and the Python3 + + boost + libgcc + + + /usr/lib/libboost_python3.so* + + - + + 2016-03-27 + 1.60.0 + Version bump, rebuilt with docker + İbrahim KARAGÜZEL + karaguzelibrahim@gmail.com + + + 2015-11-12 + 1.59.0 + Version bump, build with python3, separe boost-python* + Ertuğrul Erata + ertugrulerata@gmail.com + + 2015-07-20 1.58.0 - First release + Version bump, openmpi disabled. Ali Algul alialgul@pisilinux.org + + 2014-12-19 + 1.57.0 + Version bump. + Ergün Salman Aydemir + poyraz76@pisilinux.org + + + 2014-05-19 + 1.55.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-07 + 1.54.0 + Version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-14 + 1.53.0 + Rebuild for icu4c + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-03-04 + 1.53.0 + Version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-11-14 + 1.52.0 + First release + Osman Erkan + osman.erkan@pisilinux.org +