[arch-commits] Commit in boost/repos (6 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sun Dec 6 09:31:46 UTC 2015


    Date: Sunday, December 6, 2015 @ 10:31:46
  Author: bpiotrowski
Revision: 252690

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  boost/repos/staging-i686/
  boost/repos/staging-i686/0001-Python-Fix-condition-for-make_setter-overload.patch
    (from rev 252689, boost/trunk/0001-Python-Fix-condition-for-make_setter-overload.patch)
  boost/repos/staging-i686/PKGBUILD
    (from rev 252689, boost/trunk/PKGBUILD)
  boost/repos/staging-x86_64/
  boost/repos/staging-x86_64/0001-Python-Fix-condition-for-make_setter-overload.patch
    (from rev 252689, boost/trunk/0001-Python-Fix-condition-for-make_setter-overload.patch)
  boost/repos/staging-x86_64/PKGBUILD
    (from rev 252689, boost/trunk/PKGBUILD)

-------------------------------------------------------------------------+
 staging-i686/0001-Python-Fix-condition-for-make_setter-overload.patch   |   28 ++
 staging-i686/PKGBUILD                                                   |  106 ++++++++++
 staging-x86_64/0001-Python-Fix-condition-for-make_setter-overload.patch |   28 ++
 staging-x86_64/PKGBUILD                                                 |  106 ++++++++++
 4 files changed, 268 insertions(+)

Copied: boost/repos/staging-i686/0001-Python-Fix-condition-for-make_setter-overload.patch (from rev 252689, boost/trunk/0001-Python-Fix-condition-for-make_setter-overload.patch)
===================================================================
--- staging-i686/0001-Python-Fix-condition-for-make_setter-overload.patch	                        (rev 0)
+++ staging-i686/0001-Python-Fix-condition-for-make_setter-overload.patch	2015-12-06 09:31:46 UTC (rev 252690)
@@ -0,0 +1,28 @@
+From f410fbd64d887e2a8824f968b0533588489b5430 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely at redhat.com>
+Date: Wed, 2 Sep 2015 13:02:12 +0100
+Subject: [PATCH] Python: Fix condition for make_setter overload.
+
+This fixes the regression caused by 42e7d7b.
+
+Fixes #39
+---
+ include/boost/python/data_members.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
+index 139bde3..5d3309c 100644
+--- a/include/boost/python/data_members.hpp
++++ b/include/boost/python/data_members.hpp
+@@ -305,7 +305,7 @@ inline object make_setter(D& x)
+     return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
+ }
+ 
+-# if BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
++# if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
+ template <class D>
+ inline object make_setter(D const& x)
+ {
+-- 
+2.6.1
+

Copied: boost/repos/staging-i686/PKGBUILD (from rev 252689, boost/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-12-06 09:31:46 UTC (rev 252690)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: 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.59.0
+_boostver=${pkgver//./_}
+pkgrel=4
+url='http://www.boost.org/'
+arch=('i686' 'x86_64')
+license=('custom')
+makedepends=('icu>=55.1' 'python>=3.5' 'python<3.6' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2
+        0001-Python-Fix-condition-for-make_setter-overload.patch)
+sha1sums=('b94de47108b2cdb0f931833a7a9834c2dd3ca46e'
+          'bd76d969b6f8fbe95f05fba13b57a001764c216c')
+
+prepare() {
+   cd ${pkgbase}_${_boostver}
+
+   # https://github.com/boostorg/python/issues/39
+   patch -Np2 -i ../0001-Python-Fix-condition-for-make_setter-overload.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
+
+   # Add an extra python version. This does not replace anything and python 2.x
+   # need to be the default.
+   echo "using python : 3.5 : /usr/bin/python3 : /usr/include/python3.5m : /usr/lib ;" \
+      >> project-config.jam
+
+   # 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} -O3" linkflags="${LDFLAGS}" \
+      --layout=system \
+      --prefix="${_stagedir}" \
+      ${JOBS} \
+      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'
+               'boost-build: to use boost jam for building your project.')
+   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
+
+   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')
+
+   install -dm755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/lib "${pkgdir}"/usr
+   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/staging-x86_64/0001-Python-Fix-condition-for-make_setter-overload.patch (from rev 252689, boost/trunk/0001-Python-Fix-condition-for-make_setter-overload.patch)
===================================================================
--- staging-x86_64/0001-Python-Fix-condition-for-make_setter-overload.patch	                        (rev 0)
+++ staging-x86_64/0001-Python-Fix-condition-for-make_setter-overload.patch	2015-12-06 09:31:46 UTC (rev 252690)
@@ -0,0 +1,28 @@
+From f410fbd64d887e2a8824f968b0533588489b5430 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely at redhat.com>
+Date: Wed, 2 Sep 2015 13:02:12 +0100
+Subject: [PATCH] Python: Fix condition for make_setter overload.
+
+This fixes the regression caused by 42e7d7b.
+
+Fixes #39
+---
+ include/boost/python/data_members.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
+index 139bde3..5d3309c 100644
+--- a/include/boost/python/data_members.hpp
++++ b/include/boost/python/data_members.hpp
+@@ -305,7 +305,7 @@ inline object make_setter(D& x)
+     return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
+ }
+ 
+-# if BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
++# if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
+ template <class D>
+ inline object make_setter(D const& x)
+ {
+-- 
+2.6.1
+

Copied: boost/repos/staging-x86_64/PKGBUILD (from rev 252689, boost/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-12-06 09:31:46 UTC (rev 252690)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: 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.59.0
+_boostver=${pkgver//./_}
+pkgrel=4
+url='http://www.boost.org/'
+arch=('i686' 'x86_64')
+license=('custom')
+makedepends=('icu>=55.1' 'python>=3.5' 'python<3.6' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2
+        0001-Python-Fix-condition-for-make_setter-overload.patch)
+sha1sums=('b94de47108b2cdb0f931833a7a9834c2dd3ca46e'
+          'bd76d969b6f8fbe95f05fba13b57a001764c216c')
+
+prepare() {
+   cd ${pkgbase}_${_boostver}
+
+   # https://github.com/boostorg/python/issues/39
+   patch -Np2 -i ../0001-Python-Fix-condition-for-make_setter-overload.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
+
+   # Add an extra python version. This does not replace anything and python 2.x
+   # need to be the default.
+   echo "using python : 3.5 : /usr/bin/python3 : /usr/include/python3.5m : /usr/lib ;" \
+      >> project-config.jam
+
+   # 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} -O3" linkflags="${LDFLAGS}" \
+      --layout=system \
+      --prefix="${_stagedir}" \
+      ${JOBS} \
+      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'
+               'boost-build: to use boost jam for building your project.')
+   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
+
+   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')
+
+   install -dm755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/lib "${pkgdir}"/usr
+   rm "${pkgdir}"/usr/lib/*.a
+
+   install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+}



More information about the arch-commits mailing list