Merge pull request #1410 from ibrahimkaraguzel/master
boost: version bump, rebuilt with docker
This commit is contained in:
Ertuğrul Erata
@@ -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")
|
||||
shelltools.system("./b2 install threading=multi link=shared")
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
From a332112317450457c715675686386ec81214b863 Mon Sep 17 00:00:00 2001
|
||||
From: Axel Huebl <axel.huebl@plasma.ninja>
|
||||
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 <cstddef> 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 <cstddef>
|
||||
#else
|
||||
#include <stddef.h>
|
||||
#endif
|
||||
-#if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__)
|
||||
+#if defined(_GLIBCXX_USE_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(__CUDACC__)
|
||||
# define BOOST_HAS_FLOAT128
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
@@ -14,27 +13,28 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Peer-reviewed portable C++ source libraries</Summary>
|
||||
<Description>Boost provides free portable peer-reviewed C++ libraries. The emphasis is on portable libraries which work well with the C++ Standard Library.</Description>
|
||||
<Archive sha1sum="2fc96c1651ac6fe9859b678b165bd78dc211e881" type="tarbz2">mirrors://sourceforge/boost/boost_1_58_0.tar.bz2</Archive>
|
||||
<Archive sha1sum="7f56ab507d3258610391b47fef6b11635861175a" type="tarbz2">mirrors://sourceforge/boost/boost_1_60_0.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>icu4c-devel</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>python-devel</Dependency>
|
||||
<Dependency>bzip2</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>icu4c-devel</Dependency>
|
||||
<Dependency>python-devel</Dependency>
|
||||
<Dependency>python3-devel</Dependency>
|
||||
<!-- libsxlt is needed for xsltproc -->
|
||||
<Dependency>libxslt</Dependency>
|
||||
<!--Dependency>openmpi-devel</Dependency-->
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>boost-1.58.0-Fix-for-bind-void-mf-ambiguous-resolution-error.patch</Patch>
|
||||
<Patch>cuda_float128.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>boost</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>icu4c</Dependency>
|
||||
<Dependency>zlib</Dependency>
|
||||
<Dependency>bzip2</Dependency>
|
||||
<Dependency>icu4c</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<!--Dependency>openmpi</Dependency-->
|
||||
</RuntimeDependencies>
|
||||
@@ -58,14 +58,94 @@
|
||||
<Path fileType="doc">/usr/share/doc/*/html</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>boost-python</Name>
|
||||
<Summary>a C++ library which enables seamless interoperability between C++ and the Python</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">boost</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libboost_python.so*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>boost-python3</Name>
|
||||
<Summary>Headers and library documentation for boosta C++ library which enables seamless interoperability between C++ and the Python3</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">boost</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/libboost_python3.so*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Update release="9">
|
||||
<Date>2016-03-27</Date>
|
||||
<Version>1.60.0</Version>
|
||||
<Comment>Version bump, rebuilt with docker</Comment>
|
||||
<Name>İbrahim KARAGÜZEL</Name>
|
||||
<Email>karaguzelibrahim@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2015-11-12</Date>
|
||||
<Version>1.59.0</Version>
|
||||
<Comment>Version bump, build with python3, separe boost-python*</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2015-07-20</Date>
|
||||
<Version>1.58.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Comment>Version bump, openmpi disabled. </Comment>
|
||||
<Name>Ali Algul</Name>
|
||||
<Email>alialgul@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2014-12-19</Date>
|
||||
<Version>1.57.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ergün Salman Aydemir</Name>
|
||||
<Email>poyraz76@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2014-05-19</Date>
|
||||
<Version>1.55.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Yusuf Aydemir</Name>
|
||||
<Email>yusuf.aydemir@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2013-11-07</Date>
|
||||
<Version>1.54.0</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Yusuf Aydemir</Name>
|
||||
<Email>yusuf.aydemir@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2013-10-14</Date>
|
||||
<Version>1.53.0</Version>
|
||||
<Comment>Rebuild for icu4c</Comment>
|
||||
<Name>Yusuf Aydemir</Name>
|
||||
<Email>yusuf.aydemir@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-03-04</Date>
|
||||
<Version>1.53.0</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Yusuf Aydemir</Name>
|
||||
<Email>yusuf.aydemir@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-11-14</Date>
|
||||
<Version>1.52.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
|
||||
Reference in New Issue
Block a user