Date: Thursday, July 13, 2017 @ 07:01:18 Author: bpiotrowski Revision: 300224
archrelease: copy trunk to extra-i686, extra-x86_64 Added: boost/repos/extra-i686/PKGBUILD (from rev 300223, boost/trunk/PKGBUILD) boost/repos/extra-i686/boost-serialization-1.64.0-fixes.patch (from rev 300223, boost/trunk/boost-serialization-1.64.0-fixes.patch) boost/repos/extra-x86_64/PKGBUILD (from rev 300223, boost/trunk/PKGBUILD) boost/repos/extra-x86_64/boost-serialization-1.64.0-fixes.patch (from rev 300223, boost/trunk/boost-serialization-1.64.0-fixes.patch) Deleted: boost/repos/extra-i686/PKGBUILD boost/repos/extra-i686/boost-serialization-1.64.0-fixes.patch boost/repos/extra-x86_64/PKGBUILD boost/repos/extra-x86_64/boost-serialization-1.64.0-fixes.patch -----------------------------------------------------+ /PKGBUILD | 266 ++++++++++++++++++ /boost-serialization-1.64.0-fixes.patch | 204 +++++++++++++ extra-i686/PKGBUILD | 132 -------- extra-i686/boost-serialization-1.64.0-fixes.patch | 102 ------ extra-x86_64/PKGBUILD | 132 -------- extra-x86_64/boost-serialization-1.64.0-fixes.patch | 102 ------ 6 files changed, 470 insertions(+), 468 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-07-13 07:01:09 UTC (rev 300223) +++ extra-i686/PKGBUILD 2017-07-13 07:01:18 UTC (rev 300224) @@ -1,132 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: kevin <ke...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Kritoke <krit...@gamebox.net> -# Contributor: Luca Roccia <little_r...@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.64.0 -_boostver=${pkgver//./_} -pkgrel=3 -url='http://www.boost.org/' -arch=('i686' 'x86_64') -license=('custom') -makedepends=('icu>=55.1' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi') -source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 - boost-serialization-1.64.0-fixes.patch) -sha256sums=('7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332' - 'e2ee2500c3bcbd6f53eb7a55830dc58795f321874737dd0846e36323dfbdea26') - -build() { - export _stagedir="${srcdir}/stagedir" - local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" - - cd ${pkgbase}_${_boostver} - patch -p2 -i "$srcdir/boost-serialization-1.64.0-fixes.patch" - - ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 - - _bindir="bin.linuxx86" - [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" - install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 - - # Support for OpenMPI - echo "using mpi ;" >> project-config.jam - - # boostbook is needed by quickbook - install -dm755 "${_stagedir}"/share/boostbook - cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - "${_stagedir}"/bin/b2 \ - variant=release \ - debug-symbols=off \ - threading=multi \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - python=2.7 \ - cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ - cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ - linkflags="${LDFLAGS}" \ - --layout=system \ - ${JOBS} \ - \ - --prefix="${_stagedir}" \ - install - - # because b2 in boost 1.62.0 doesn't seem to respect python parameter, we - # need another run for liboost_python3.so - sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \ - -i bootstrap.sh - - ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python3 \ - --with-libraries=python - - "${_stagedir}"/bin/b2 clean - "${_stagedir}"/bin/b2 \ - variant=release \ - debug-symbols=off \ - threading=multi \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - python=3.6 \ - cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ - cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ - linkflags="${LDFLAGS}" \ - --layout=system \ - ${JOBS} \ - \ - --prefix="${_stagedir}/python3" \ - --with-python \ - install -} - -package_boost() { - pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings') - options=('staticlibs') - - install -dm755 "${pkgdir}"/usr - cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - - install -d "${pkgdir}"/usr/lib - cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt - - install -Dm644 "${_stagedir}"/python3/lib/libboost_*.a \ - "${pkgdir}"/usr/lib/ - - ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam -} - -package_boost-libs() { - pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' - depends=('bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - # powerdns-recursor keeps being rebuild against outdated boost-libs - provides=('libboost_context.so') - - install -dm755 "${pkgdir}"/usr - cp -a "${_stagedir}"/lib "${pkgdir}"/usr - cp -a "${_stagedir}"/python3/lib/libboost_* "${pkgdir}"/usr/lib - rm "${pkgdir}"/usr/lib/*.a - - install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} Copied: boost/repos/extra-i686/PKGBUILD (from rev 300223, boost/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-07-13 07:01:18 UTC (rev 300224) @@ -0,0 +1,133 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Marius Knaust <marius.kna...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Kritoke <krit...@gamebox.net> +# Contributor: Luca Roccia <little_r...@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.64.0 +_boostver=${pkgver//./_} +pkgrel=4 +url='http://www.boost.org/' +arch=('i686' 'x86_64') +license=('custom') +makedepends=('icu>=55.1' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi') +source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 + boost-serialization-1.64.0-fixes.patch) +sha256sums=('7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332' + 'e2ee2500c3bcbd6f53eb7a55830dc58795f321874737dd0846e36323dfbdea26') + +build() { + export _stagedir="${srcdir}/stagedir" + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd ${pkgbase}_${_boostver} + patch -p2 -i "$srcdir/boost-serialization-1.64.0-fixes.patch" + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 + + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam + + # boostbook is needed by quickbook + install -dm755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ + cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ + linkflags="${LDFLAGS}" \ + --layout=system \ + ${JOBS} \ + \ + --prefix="${_stagedir}" \ + install + + # because b2 in boost 1.62.0 doesn't seem to respect python parameter, we + # need another run for liboost_python3.so + sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \ + -i bootstrap.sh + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python3 \ + --with-libraries=python + + "${_stagedir}"/bin/b2 clean + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + python=3.6 \ + cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ + cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ + linkflags="${LDFLAGS}" \ + --layout=system \ + ${JOBS} \ + \ + --prefix="${_stagedir}/python3" \ + --with-python \ + install +} + +package_boost() { + pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings') + options=('staticlibs') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr + + install -d "${pkgdir}"/usr/lib + cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + + install -Dm644 "${_stagedir}"/python3/lib/libboost_*.a \ + "${pkgdir}"/usr/lib/ + + ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam +} + +package_boost-libs() { + pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + # powerdns-recursor keeps being rebuild against outdated boost-libs + provides=('libboost_context.so') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + cp -a "${_stagedir}"/python3/lib/libboost_* "${pkgdir}"/usr/lib + rm "${pkgdir}"/usr/lib/*.a + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} Deleted: extra-i686/boost-serialization-1.64.0-fixes.patch =================================================================== --- extra-i686/boost-serialization-1.64.0-fixes.patch 2017-07-13 07:01:09 UTC (rev 300223) +++ extra-i686/boost-serialization-1.64.0-fixes.patch 2017-07-13 07:01:18 UTC (rev 300224) @@ -1,102 +0,0 @@ -From a44c228e28d3d82137e9efe376b425013aa59f0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrow...@archlinux.org> -Date: Tue, 16 May 2017 15:08:59 +0200 -Subject: [PATCH] Restore boost/serialization/detail/get_data.hpp - -This reverts commit d558b6da917ecae1036adf9b22a0741c78f627ff. ---- - include/boost/serialization/detail/get_data.hpp | 59 +++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - create mode 100644 include/boost/serialization/detail/get_data.hpp - -diff --git a/include/boost/serialization/detail/get_data.hpp b/include/boost/serialization/detail/get_data.hpp -new file mode 100644 -index 00000000..37da7fc3 ---- /dev/null -+++ b/include/boost/serialization/detail/get_data.hpp -@@ -0,0 +1,59 @@ -+// (C) Copyright 2005 Matthias Troyer -+// Use, modification and distribution is subject to the Boost Software -+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -+// http://www.boost.org/LICENSE_1_0.txt) -+ -+// See http://www.boost.org for updates, documentation, and revision history. -+ -+#ifndef BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP -+#define BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP -+ -+// MS compatible compilers support #pragma once -+#if defined(_MSC_VER) -+# pragma once -+#endif -+ -+#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) -+#define STD _STLP_STD -+#else -+#define STD std -+#endif -+ -+#include <vector> -+#include <valarray> -+ -+namespace boost { -+namespace serialization { -+namespace detail { -+ -+template <class T, class Allocator> -+T* get_data(STD::vector<T,Allocator>& v) -+{ -+ return v.empty() ? 0 : &(v[0]); -+} -+ -+template <class T, class Allocator> -+T* get_data(STD::vector<T,Allocator> const & v) -+{ -+ return get_data(const_cast<STD::vector<T,Allocator>&>(v)); -+} -+ -+template <class T> -+T* get_data(STD::valarray<T>& v) -+{ -+ return v.size()==0 ? 0 : &(v[0]); -+} -+ -+template <class T> -+const T* get_data(STD::valarray<T> const& v) -+{ -+ return get_data(const_cast<STD::valarray<T>&>(v)); -+} -+ -+} // detail -+} // serialization -+} // boost -+ -+#undef STD -+ -+#endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP --- -2.13.0 - -From 1d86261581230e2dc5d617a9b16287d326f3e229 Mon Sep 17 00:00:00 2001 -From: Robert Ramey <ra...@rrsd.com> -Date: Wed, 1 Feb 2017 16:43:59 -0800 -Subject: [PATCH] correct error which appeared when compiling non c++ compliant - code for arrays - ---- - include/boost/serialization/array.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp -index 61708b3..612d1a6 100644 ---- a/include/boost/serialization/array.hpp -+++ b/include/boost/serialization/array.hpp -@@ -23,6 +23,8 @@ namespace std{ - } // namespace std - #endif - -+#include <boost/serialization/array_wrapper.hpp> -+ - #ifndef BOOST_NO_CXX11_HDR_ARRAY - - #include <array> Copied: boost/repos/extra-i686/boost-serialization-1.64.0-fixes.patch (from rev 300223, boost/trunk/boost-serialization-1.64.0-fixes.patch) =================================================================== --- extra-i686/boost-serialization-1.64.0-fixes.patch (rev 0) +++ extra-i686/boost-serialization-1.64.0-fixes.patch 2017-07-13 07:01:18 UTC (rev 300224) @@ -0,0 +1,102 @@ +From a44c228e28d3d82137e9efe376b425013aa59f0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrow...@archlinux.org> +Date: Tue, 16 May 2017 15:08:59 +0200 +Subject: [PATCH] Restore boost/serialization/detail/get_data.hpp + +This reverts commit d558b6da917ecae1036adf9b22a0741c78f627ff. +--- + include/boost/serialization/detail/get_data.hpp | 59 +++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + create mode 100644 include/boost/serialization/detail/get_data.hpp + +diff --git a/include/boost/serialization/detail/get_data.hpp b/include/boost/serialization/detail/get_data.hpp +new file mode 100644 +index 00000000..37da7fc3 +--- /dev/null ++++ b/include/boost/serialization/detail/get_data.hpp +@@ -0,0 +1,59 @@ ++// (C) Copyright 2005 Matthias Troyer ++// Use, modification and distribution is subject to the Boost Software ++// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org for updates, documentation, and revision history. ++ ++#ifndef BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP ++#define BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP ++ ++// MS compatible compilers support #pragma once ++#if defined(_MSC_VER) ++# pragma once ++#endif ++ ++#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) ++#define STD _STLP_STD ++#else ++#define STD std ++#endif ++ ++#include <vector> ++#include <valarray> ++ ++namespace boost { ++namespace serialization { ++namespace detail { ++ ++template <class T, class Allocator> ++T* get_data(STD::vector<T,Allocator>& v) ++{ ++ return v.empty() ? 0 : &(v[0]); ++} ++ ++template <class T, class Allocator> ++T* get_data(STD::vector<T,Allocator> const & v) ++{ ++ return get_data(const_cast<STD::vector<T,Allocator>&>(v)); ++} ++ ++template <class T> ++T* get_data(STD::valarray<T>& v) ++{ ++ return v.size()==0 ? 0 : &(v[0]); ++} ++ ++template <class T> ++const T* get_data(STD::valarray<T> const& v) ++{ ++ return get_data(const_cast<STD::valarray<T>&>(v)); ++} ++ ++} // detail ++} // serialization ++} // boost ++ ++#undef STD ++ ++#endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP +-- +2.13.0 + +From 1d86261581230e2dc5d617a9b16287d326f3e229 Mon Sep 17 00:00:00 2001 +From: Robert Ramey <ra...@rrsd.com> +Date: Wed, 1 Feb 2017 16:43:59 -0800 +Subject: [PATCH] correct error which appeared when compiling non c++ compliant + code for arrays + +--- + include/boost/serialization/array.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp +index 61708b3..612d1a6 100644 +--- a/include/boost/serialization/array.hpp ++++ b/include/boost/serialization/array.hpp +@@ -23,6 +23,8 @@ namespace std{ + } // namespace std + #endif + ++#include <boost/serialization/array_wrapper.hpp> ++ + #ifndef BOOST_NO_CXX11_HDR_ARRAY + + #include <array> Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-07-13 07:01:09 UTC (rev 300223) +++ extra-x86_64/PKGBUILD 2017-07-13 07:01:18 UTC (rev 300224) @@ -1,132 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: kevin <ke...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Kritoke <krit...@gamebox.net> -# Contributor: Luca Roccia <little_r...@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.64.0 -_boostver=${pkgver//./_} -pkgrel=3 -url='http://www.boost.org/' -arch=('i686' 'x86_64') -license=('custom') -makedepends=('icu>=55.1' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi') -source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 - boost-serialization-1.64.0-fixes.patch) -sha256sums=('7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332' - 'e2ee2500c3bcbd6f53eb7a55830dc58795f321874737dd0846e36323dfbdea26') - -build() { - export _stagedir="${srcdir}/stagedir" - local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" - - cd ${pkgbase}_${_boostver} - patch -p2 -i "$srcdir/boost-serialization-1.64.0-fixes.patch" - - ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 - - _bindir="bin.linuxx86" - [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" - install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 - - # Support for OpenMPI - echo "using mpi ;" >> project-config.jam - - # boostbook is needed by quickbook - install -dm755 "${_stagedir}"/share/boostbook - cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - "${_stagedir}"/bin/b2 \ - variant=release \ - debug-symbols=off \ - threading=multi \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - python=2.7 \ - cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ - cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ - linkflags="${LDFLAGS}" \ - --layout=system \ - ${JOBS} \ - \ - --prefix="${_stagedir}" \ - install - - # because b2 in boost 1.62.0 doesn't seem to respect python parameter, we - # need another run for liboost_python3.so - sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \ - -i bootstrap.sh - - ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python3 \ - --with-libraries=python - - "${_stagedir}"/bin/b2 clean - "${_stagedir}"/bin/b2 \ - variant=release \ - debug-symbols=off \ - threading=multi \ - runtime-link=shared \ - link=shared,static \ - toolset=gcc \ - python=3.6 \ - cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ - cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ - linkflags="${LDFLAGS}" \ - --layout=system \ - ${JOBS} \ - \ - --prefix="${_stagedir}/python3" \ - --with-python \ - install -} - -package_boost() { - pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings') - options=('staticlibs') - - install -dm755 "${pkgdir}"/usr - cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - - install -d "${pkgdir}"/usr/lib - cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt - - install -Dm644 "${_stagedir}"/python3/lib/libboost_*.a \ - "${pkgdir}"/usr/lib/ - - ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam -} - -package_boost-libs() { - pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' - depends=('bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - # powerdns-recursor keeps being rebuild against outdated boost-libs - provides=('libboost_context.so') - - install -dm755 "${pkgdir}"/usr - cp -a "${_stagedir}"/lib "${pkgdir}"/usr - cp -a "${_stagedir}"/python3/lib/libboost_* "${pkgdir}"/usr/lib - rm "${pkgdir}"/usr/lib/*.a - - install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} Copied: boost/repos/extra-x86_64/PKGBUILD (from rev 300223, boost/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-07-13 07:01:18 UTC (rev 300224) @@ -0,0 +1,133 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Marius Knaust <marius.kna...@gmail.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Kritoke <krit...@gamebox.net> +# Contributor: Luca Roccia <little_r...@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.64.0 +_boostver=${pkgver//./_} +pkgrel=4 +url='http://www.boost.org/' +arch=('i686' 'x86_64') +license=('custom') +makedepends=('icu>=55.1' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi') +source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 + boost-serialization-1.64.0-fixes.patch) +sha256sums=('7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332' + 'e2ee2500c3bcbd6f53eb7a55830dc58795f321874737dd0846e36323dfbdea26') + +build() { + export _stagedir="${srcdir}/stagedir" + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd ${pkgbase}_${_boostver} + patch -p2 -i "$srcdir/boost-serialization-1.64.0-fixes.patch" + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 + + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam + + # boostbook is needed by quickbook + install -dm755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ + cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ + linkflags="${LDFLAGS}" \ + --layout=system \ + ${JOBS} \ + \ + --prefix="${_stagedir}" \ + install + + # because b2 in boost 1.62.0 doesn't seem to respect python parameter, we + # need another run for liboost_python3.so + sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \ + -i bootstrap.sh + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python3 \ + --with-libraries=python + + "${_stagedir}"/bin/b2 clean + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + python=3.6 \ + cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ + cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ + linkflags="${LDFLAGS}" \ + --layout=system \ + ${JOBS} \ + \ + --prefix="${_stagedir}/python3" \ + --with-python \ + install +} + +package_boost() { + pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings') + options=('staticlibs') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr + + install -d "${pkgdir}"/usr/lib + cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + + install -Dm644 "${_stagedir}"/python3/lib/libboost_*.a \ + "${pkgdir}"/usr/lib/ + + ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam +} + +package_boost-libs() { + pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + # powerdns-recursor keeps being rebuild against outdated boost-libs + provides=('libboost_context.so') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + cp -a "${_stagedir}"/python3/lib/libboost_* "${pkgdir}"/usr/lib + rm "${pkgdir}"/usr/lib/*.a + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} Deleted: extra-x86_64/boost-serialization-1.64.0-fixes.patch =================================================================== --- extra-x86_64/boost-serialization-1.64.0-fixes.patch 2017-07-13 07:01:09 UTC (rev 300223) +++ extra-x86_64/boost-serialization-1.64.0-fixes.patch 2017-07-13 07:01:18 UTC (rev 300224) @@ -1,102 +0,0 @@ -From a44c228e28d3d82137e9efe376b425013aa59f0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrow...@archlinux.org> -Date: Tue, 16 May 2017 15:08:59 +0200 -Subject: [PATCH] Restore boost/serialization/detail/get_data.hpp - -This reverts commit d558b6da917ecae1036adf9b22a0741c78f627ff. ---- - include/boost/serialization/detail/get_data.hpp | 59 +++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - create mode 100644 include/boost/serialization/detail/get_data.hpp - -diff --git a/include/boost/serialization/detail/get_data.hpp b/include/boost/serialization/detail/get_data.hpp -new file mode 100644 -index 00000000..37da7fc3 ---- /dev/null -+++ b/include/boost/serialization/detail/get_data.hpp -@@ -0,0 +1,59 @@ -+// (C) Copyright 2005 Matthias Troyer -+// Use, modification and distribution is subject to the Boost Software -+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -+// http://www.boost.org/LICENSE_1_0.txt) -+ -+// See http://www.boost.org for updates, documentation, and revision history. -+ -+#ifndef BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP -+#define BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP -+ -+// MS compatible compilers support #pragma once -+#if defined(_MSC_VER) -+# pragma once -+#endif -+ -+#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) -+#define STD _STLP_STD -+#else -+#define STD std -+#endif -+ -+#include <vector> -+#include <valarray> -+ -+namespace boost { -+namespace serialization { -+namespace detail { -+ -+template <class T, class Allocator> -+T* get_data(STD::vector<T,Allocator>& v) -+{ -+ return v.empty() ? 0 : &(v[0]); -+} -+ -+template <class T, class Allocator> -+T* get_data(STD::vector<T,Allocator> const & v) -+{ -+ return get_data(const_cast<STD::vector<T,Allocator>&>(v)); -+} -+ -+template <class T> -+T* get_data(STD::valarray<T>& v) -+{ -+ return v.size()==0 ? 0 : &(v[0]); -+} -+ -+template <class T> -+const T* get_data(STD::valarray<T> const& v) -+{ -+ return get_data(const_cast<STD::valarray<T>&>(v)); -+} -+ -+} // detail -+} // serialization -+} // boost -+ -+#undef STD -+ -+#endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP --- -2.13.0 - -From 1d86261581230e2dc5d617a9b16287d326f3e229 Mon Sep 17 00:00:00 2001 -From: Robert Ramey <ra...@rrsd.com> -Date: Wed, 1 Feb 2017 16:43:59 -0800 -Subject: [PATCH] correct error which appeared when compiling non c++ compliant - code for arrays - ---- - include/boost/serialization/array.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp -index 61708b3..612d1a6 100644 ---- a/include/boost/serialization/array.hpp -+++ b/include/boost/serialization/array.hpp -@@ -23,6 +23,8 @@ namespace std{ - } // namespace std - #endif - -+#include <boost/serialization/array_wrapper.hpp> -+ - #ifndef BOOST_NO_CXX11_HDR_ARRAY - - #include <array> Copied: boost/repos/extra-x86_64/boost-serialization-1.64.0-fixes.patch (from rev 300223, boost/trunk/boost-serialization-1.64.0-fixes.patch) =================================================================== --- extra-x86_64/boost-serialization-1.64.0-fixes.patch (rev 0) +++ extra-x86_64/boost-serialization-1.64.0-fixes.patch 2017-07-13 07:01:18 UTC (rev 300224) @@ -0,0 +1,102 @@ +From a44c228e28d3d82137e9efe376b425013aa59f0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrow...@archlinux.org> +Date: Tue, 16 May 2017 15:08:59 +0200 +Subject: [PATCH] Restore boost/serialization/detail/get_data.hpp + +This reverts commit d558b6da917ecae1036adf9b22a0741c78f627ff. +--- + include/boost/serialization/detail/get_data.hpp | 59 +++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + create mode 100644 include/boost/serialization/detail/get_data.hpp + +diff --git a/include/boost/serialization/detail/get_data.hpp b/include/boost/serialization/detail/get_data.hpp +new file mode 100644 +index 00000000..37da7fc3 +--- /dev/null ++++ b/include/boost/serialization/detail/get_data.hpp +@@ -0,0 +1,59 @@ ++// (C) Copyright 2005 Matthias Troyer ++// Use, modification and distribution is subject to the Boost Software ++// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt) ++ ++// See http://www.boost.org for updates, documentation, and revision history. ++ ++#ifndef BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP ++#define BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP ++ ++// MS compatible compilers support #pragma once ++#if defined(_MSC_VER) ++# pragma once ++#endif ++ ++#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) ++#define STD _STLP_STD ++#else ++#define STD std ++#endif ++ ++#include <vector> ++#include <valarray> ++ ++namespace boost { ++namespace serialization { ++namespace detail { ++ ++template <class T, class Allocator> ++T* get_data(STD::vector<T,Allocator>& v) ++{ ++ return v.empty() ? 0 : &(v[0]); ++} ++ ++template <class T, class Allocator> ++T* get_data(STD::vector<T,Allocator> const & v) ++{ ++ return get_data(const_cast<STD::vector<T,Allocator>&>(v)); ++} ++ ++template <class T> ++T* get_data(STD::valarray<T>& v) ++{ ++ return v.size()==0 ? 0 : &(v[0]); ++} ++ ++template <class T> ++const T* get_data(STD::valarray<T> const& v) ++{ ++ return get_data(const_cast<STD::valarray<T>&>(v)); ++} ++ ++} // detail ++} // serialization ++} // boost ++ ++#undef STD ++ ++#endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP +-- +2.13.0 + +From 1d86261581230e2dc5d617a9b16287d326f3e229 Mon Sep 17 00:00:00 2001 +From: Robert Ramey <ra...@rrsd.com> +Date: Wed, 1 Feb 2017 16:43:59 -0800 +Subject: [PATCH] correct error which appeared when compiling non c++ compliant + code for arrays + +--- + include/boost/serialization/array.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp +index 61708b3..612d1a6 100644 +--- a/include/boost/serialization/array.hpp ++++ b/include/boost/serialization/array.hpp +@@ -23,6 +23,8 @@ namespace std{ + } // namespace std + #endif + ++#include <boost/serialization/array_wrapper.hpp> ++ + #ifndef BOOST_NO_CXX11_HDR_ARRAY + + #include <array>