[arch-commits] Commit in boost/repos/extra-x86_64 (7 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Jul 12 00:08:25 UTC 2018
Date: Thursday, July 12, 2018 @ 00:08:25
Author: foutrelis
Revision: 328292
archrelease: copy trunk to extra-x86_64
Added:
boost/repos/extra-x86_64/PKGBUILD
(from rev 328291, boost/trunk/PKGBUILD)
boost/repos/extra-x86_64/add-missing-return-statement-in-numpy-import.patch
(from rev 328291, boost/trunk/add-missing-return-statement-in-numpy-import.patch)
boost/repos/extra-x86_64/fix-return-var-qualifier-in-svm_ptr-get_context.patch
(from rev 328291, boost/trunk/fix-return-var-qualifier-in-svm_ptr-get_context.patch)
boost/repos/extra-x86_64/lockfree-add-include-boost-next_prior.patch
(from rev 328291, boost/trunk/lockfree-add-include-boost-next_prior.patch)
Deleted:
boost/repos/extra-x86_64/PKGBUILD
boost/repos/extra-x86_64/fix-return-var-qualifier-in-svm_ptr-get_context.patch
boost/repos/extra-x86_64/lockfree-add-include-boost-next_prior.patch
-------------------------------------------------------+
PKGBUILD | 295 ++++++++--------
add-missing-return-statement-in-numpy-import.patch | 29 +
fix-return-var-qualifier-in-svm_ptr-get_context.patch | 46 +-
lockfree-add-include-boost-next_prior.patch | 42 +-
4 files changed, 223 insertions(+), 189 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-12 00:08:19 UTC (rev 328291)
+++ PKGBUILD 2018-07-12 00:08:25 UTC (rev 328292)
@@ -1,145 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Marius Knaust <marius.knaust at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Kritoke <kritoke at gamebox.net>
-# Contributor: Luca Roccia <little_rock at users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.67.0
-_boostver=${pkgver//./_}
-pkgrel=4
-url='http://www.boost.org/'
-arch=('x86_64')
-license=('custom')
-makedepends=('icu' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi')
-source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2
- lockfree-add-include-boost-next_prior.patch
- fix-return-var-qualifier-in-svm_ptr-get_context.patch)
-sha256sums=('2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
- '2639c43e33f9279ffbebf270be0e0951b9f0e7a8264f8c3bfebb5b9901da2db6'
- '43cdc2081f90d2acc7e4d9de6689bce07b2a1b4754e85dc7fa50872afa330ffa')
-
-prepare() {
- cd ${pkgbase}_${_boostver}
- patch -Np2 -i ../lockfree-add-include-boost-next_prior.patch
- patch -Np2 -i ../fix-return-var-qualifier-in-svm_ptr-get_context.patch
-}
-
-build() {
- export _stagedir="${srcdir}/stagedir"
- local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
-
- cd ${pkgbase}_${_boostver}
-
- ./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
-
- # https://github.com/boostorg/python/issues/203#issuecomment-391477685
- for _lib in python numpy; do
- ln -srL "${pkgdir}"/usr/lib/libboost_${_lib}{27,}.so
- ln -srL "${pkgdir}"/usr/lib/libboost_${_lib}3{6,}.so
- done
-
- 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 328291, boost/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-12 00:08:25 UTC (rev 328292)
@@ -0,0 +1,150 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Marius Knaust <marius.knaust at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Kritoke <kritoke at gamebox.net>
+# Contributor: Luca Roccia <little_rock at users.sourceforge.net>
+
+pkgbase=boost
+pkgname=('boost-libs' 'boost')
+pkgver=1.67.0
+_boostver=${pkgver//./_}
+pkgrel=5
+url='http://www.boost.org/'
+arch=('x86_64')
+license=('custom')
+makedepends=('icu' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi')
+source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2
+ add-missing-return-statement-in-numpy-import.patch
+ lockfree-add-include-boost-next_prior.patch
+ fix-return-var-qualifier-in-svm_ptr-get_context.patch)
+sha256sums=('2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
+ '04aa755427415c3e1e8080d2bc607c27856f806599c8d35737a3c263b419ed8d'
+ '2639c43e33f9279ffbebf270be0e0951b9f0e7a8264f8c3bfebb5b9901da2db6'
+ '43cdc2081f90d2acc7e4d9de6689bce07b2a1b4754e85dc7fa50872afa330ffa')
+
+prepare() {
+ cd ${pkgbase}_${_boostver}
+ patch -Np2 -i ../lockfree-add-include-boost-next_prior.patch
+ patch -Np2 -i ../fix-return-var-qualifier-in-svm_ptr-get_context.patch
+
+ # https://github.com/boostorg/python/issues/209
+ patch -d libs/python -Np1 < ../add-missing-return-statement-in-numpy-import.patch
+}
+
+build() {
+ export _stagedir="${srcdir}/stagedir"
+ local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
+
+ cd ${pkgbase}_${_boostver}
+
+ ./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
+
+ # https://github.com/boostorg/python/issues/203#issuecomment-391477685
+ for _lib in python numpy; do
+ ln -srL "${pkgdir}"/usr/lib/libboost_${_lib}{27,}.so
+ ln -srL "${pkgdir}"/usr/lib/libboost_${_lib}3{6,}.so
+ done
+
+ 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/add-missing-return-statement-in-numpy-import.patch (from rev 328291, boost/trunk/add-missing-return-statement-in-numpy-import.patch)
===================================================================
--- add-missing-return-statement-in-numpy-import.patch (rev 0)
+++ add-missing-return-statement-in-numpy-import.patch 2018-07-12 00:08:25 UTC (rev 328292)
@@ -0,0 +1,29 @@
+From ed4776b59caec6dfbea548a96701a810653e6f24 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= <moritz.wanzenboeck at catalysts.cc>
+Date: Wed, 11 Jul 2018 11:57:46 +0200
+Subject: [PATCH] Add missing return statement in numpy import
+
+This adds a missing return statement in the python3 specific
+import logic of boost.python.numpy.
+
+For python3 wrap_import_array() needs to return a pointer value.
+The import_array() macro only returns NULL in case of error. The
+missing return statement is UB, so the compiler can assume it does
+not happen. This means the compiler can assume the error branch
+is always taken, so import_array must always fail.
+---
+ src/numpy/numpy.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/numpy/numpy.cpp b/src/numpy/numpy.cpp
+index 8e259bc75..3ae2295e3 100644
+--- a/src/numpy/numpy.cpp
++++ b/src/numpy/numpy.cpp
+@@ -19,6 +19,7 @@ static void wrap_import_array()
+ static void * wrap_import_array()
+ {
+ import_array();
++ return NULL;
+ }
+ #endif
+
Deleted: fix-return-var-qualifier-in-svm_ptr-get_context.patch
===================================================================
--- fix-return-var-qualifier-in-svm_ptr-get_context.patch 2018-07-12 00:08:19 UTC (rev 328291)
+++ fix-return-var-qualifier-in-svm_ptr-get_context.patch 2018-07-12 00:08:25 UTC (rev 328292)
@@ -1,23 +0,0 @@
-From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
-From: pradeep <pradeep at arrayfire.com>
-Date: Tue, 8 May 2018 14:53:38 +0530
-Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
-
-Lack of `const` qualifier is throwing errors with GCC 8.1
----
- include/boost/compute/memory/svm_ptr.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
-index c8753f5b..56cf1268 100644
---- a/include/boost/compute/memory/svm_ptr.hpp
-+++ b/include/boost/compute/memory/svm_ptr.hpp
-@@ -126,7 +126,7 @@ class svm_ptr
- return m_ptr - other.m_ptr;
- }
-
-- context& get_context() const
-+ const context& get_context() const
- {
- return m_context;
- }
Copied: boost/repos/extra-x86_64/fix-return-var-qualifier-in-svm_ptr-get_context.patch (from rev 328291, boost/trunk/fix-return-var-qualifier-in-svm_ptr-get_context.patch)
===================================================================
--- fix-return-var-qualifier-in-svm_ptr-get_context.patch (rev 0)
+++ fix-return-var-qualifier-in-svm_ptr-get_context.patch 2018-07-12 00:08:25 UTC (rev 328292)
@@ -0,0 +1,23 @@
+From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
+From: pradeep <pradeep at arrayfire.com>
+Date: Tue, 8 May 2018 14:53:38 +0530
+Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
+
+Lack of `const` qualifier is throwing errors with GCC 8.1
+---
+ include/boost/compute/memory/svm_ptr.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
+index c8753f5b..56cf1268 100644
+--- a/include/boost/compute/memory/svm_ptr.hpp
++++ b/include/boost/compute/memory/svm_ptr.hpp
+@@ -126,7 +126,7 @@ class svm_ptr
+ return m_ptr - other.m_ptr;
+ }
+
+- context& get_context() const
++ const context& get_context() const
+ {
+ return m_context;
+ }
Deleted: lockfree-add-include-boost-next_prior.patch
===================================================================
--- lockfree-add-include-boost-next_prior.patch 2018-07-12 00:08:19 UTC (rev 328291)
+++ lockfree-add-include-boost-next_prior.patch 2018-07-12 00:08:25 UTC (rev 328292)
@@ -1,21 +0,0 @@
-From 12726cda009a855073b9bedbdce57b6ce7763da2 Mon Sep 17 00:00:00 2001
-From: Peter Dimov <pdimov at pdimov.com>
-Date: Sat, 2 Dec 2017 04:10:46 +0200
-Subject: [PATCH] Add #include <boost/next_prior.hpp>; no longer in utility.hpp
-
----
- include/boost/lockfree/spsc_queue.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/boost/lockfree/spsc_queue.hpp b/include/boost/lockfree/spsc_queue.hpp
-index 7903d2c..c7f2953 100644
---- a/include/boost/lockfree/spsc_queue.hpp
-+++ b/include/boost/lockfree/spsc_queue.hpp
-@@ -17,6 +17,7 @@
- #include <boost/assert.hpp>
- #include <boost/static_assert.hpp>
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- #include <boost/utility/enable_if.hpp>
- #include <boost/config.hpp> // for BOOST_LIKELY
-
Copied: boost/repos/extra-x86_64/lockfree-add-include-boost-next_prior.patch (from rev 328291, boost/trunk/lockfree-add-include-boost-next_prior.patch)
===================================================================
--- lockfree-add-include-boost-next_prior.patch (rev 0)
+++ lockfree-add-include-boost-next_prior.patch 2018-07-12 00:08:25 UTC (rev 328292)
@@ -0,0 +1,21 @@
+From 12726cda009a855073b9bedbdce57b6ce7763da2 Mon Sep 17 00:00:00 2001
+From: Peter Dimov <pdimov at pdimov.com>
+Date: Sat, 2 Dec 2017 04:10:46 +0200
+Subject: [PATCH] Add #include <boost/next_prior.hpp>; no longer in utility.hpp
+
+---
+ include/boost/lockfree/spsc_queue.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/boost/lockfree/spsc_queue.hpp b/include/boost/lockfree/spsc_queue.hpp
+index 7903d2c..c7f2953 100644
+--- a/include/boost/lockfree/spsc_queue.hpp
++++ b/include/boost/lockfree/spsc_queue.hpp
+@@ -17,6 +17,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/utility.hpp>
++#include <boost/next_prior.hpp>
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/config.hpp> // for BOOST_LIKELY
+
More information about the arch-commits
mailing list