Date: Wednesday, December 18, 2013 @ 01:02:19 Author: svenstaro Revision: 201681
archrelease: copy trunk to testing-i686, testing-x86_64 Added: boost/repos/testing-i686/ boost/repos/testing-i686/001-log_fix_dump_avx2.patch (from rev 201680, boost/trunk/001-log_fix_dump_avx2.patch) boost/repos/testing-i686/PKGBUILD (from rev 201680, boost/trunk/PKGBUILD) boost/repos/testing-x86_64/ boost/repos/testing-x86_64/001-log_fix_dump_avx2.patch (from rev 201680, boost/trunk/001-log_fix_dump_avx2.patch) boost/repos/testing-x86_64/PKGBUILD (from rev 201680, boost/trunk/PKGBUILD) --------------------------------------------+ testing-i686/001-log_fix_dump_avx2.patch | 13 +++ testing-i686/PKGBUILD | 112 +++++++++++++++++++++++++++ testing-x86_64/001-log_fix_dump_avx2.patch | 13 +++ testing-x86_64/PKGBUILD | 112 +++++++++++++++++++++++++++ 4 files changed, 250 insertions(+) Copied: boost/repos/testing-i686/001-log_fix_dump_avx2.patch (from rev 201680, boost/trunk/001-log_fix_dump_avx2.patch) =================================================================== --- testing-i686/001-log_fix_dump_avx2.patch (rev 0) +++ testing-i686/001-log_fix_dump_avx2.patch 2013-12-18 00:02:19 UTC (rev 201681) @@ -0,0 +1,13 @@ +Index: libs/log/src/dump_avx2.cpp +=================================================================== +--- libs/log/src/dump_avx2.cpp (revision 86614) ++++ libs/log/src/dump_avx2.cpp (working copy) +@@ -205,7 +205,7 @@ + __m256i mm_input = _mm256_load_si256(reinterpret_cast< const __m256i* >(p)); + __m256i mm_output1, mm_output2, mm_output3; + dump_pack(mm_char_10_to_a, mm_input, mm_output1, mm_output2, mm_output3); +- store_characters_x3(mm_output1, mm_output2, mm_output3, buf); ++ store_characters_x3(mm_output1, mm_output2, mm_output3, b); + } + + _mm256_zeroall(); // need to zero all ymm registers to avoid register spills/restores the compler generates around the function call Copied: boost/repos/testing-i686/PKGBUILD (from rev 201680, boost/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2013-12-18 00:02:19 UTC (rev 201681) @@ -0,0 +1,112 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Maintainer: Ionut Biru <ib...@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.55.0 +_boostver=${pkgver//./_} +pkgrel=3 +url="http://www.boost.org/" +arch=('i686' 'x86_64') +license=('custom') +makedepends=('icu>=52.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + 001-log_fix_dump_avx2.patch) +sha1sums=('61ed0e57d3c7c8985805bb0682de3f4c65f4b6e5' + 'a4a47cc5716df87d544ae7684aaf402287132d50') + +prepare() { + export _stagedir="${srcdir}/stagedir" + cd ${pkgbase}_${_boostver} + + patch -p0 -i ../001-log_fix_dump_avx2.patch + + # Add an extra python version. This does not replace anything and python 2.x need to be the default. + echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam + + # Support for OpenMPI + echo "using mpi ;" >> ./tools/build/v2/user-config.jam +} + +build() { + 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 "${_stagedir}"/bin + install tools/build/v2/engine/${_bindir}/b2 "${_stagedir}"/bin/b2 + + pushd tools + for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" $_tool + done + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" library_status + popd + cp -a dist/bin/* "${_stagedir}"/bin + + # 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} -std=gnu++11 -O3" linkflags="${LDFLAGS}" \ + --layout=system \ + --prefix="${_stagedir}" \ + ${JOBS} \ + install +} + +package_boost() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + 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 + find "${_stagedir}"/lib -name \*.a -exec mv {} "${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" + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} Copied: boost/repos/testing-x86_64/001-log_fix_dump_avx2.patch (from rev 201680, boost/trunk/001-log_fix_dump_avx2.patch) =================================================================== --- testing-x86_64/001-log_fix_dump_avx2.patch (rev 0) +++ testing-x86_64/001-log_fix_dump_avx2.patch 2013-12-18 00:02:19 UTC (rev 201681) @@ -0,0 +1,13 @@ +Index: libs/log/src/dump_avx2.cpp +=================================================================== +--- libs/log/src/dump_avx2.cpp (revision 86614) ++++ libs/log/src/dump_avx2.cpp (working copy) +@@ -205,7 +205,7 @@ + __m256i mm_input = _mm256_load_si256(reinterpret_cast< const __m256i* >(p)); + __m256i mm_output1, mm_output2, mm_output3; + dump_pack(mm_char_10_to_a, mm_input, mm_output1, mm_output2, mm_output3); +- store_characters_x3(mm_output1, mm_output2, mm_output3, buf); ++ store_characters_x3(mm_output1, mm_output2, mm_output3, b); + } + + _mm256_zeroall(); // need to zero all ymm registers to avoid register spills/restores the compler generates around the function call Copied: boost/repos/testing-x86_64/PKGBUILD (from rev 201680, boost/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2013-12-18 00:02:19 UTC (rev 201681) @@ -0,0 +1,112 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Maintainer: Ionut Biru <ib...@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.55.0 +_boostver=${pkgver//./_} +pkgrel=3 +url="http://www.boost.org/" +arch=('i686' 'x86_64') +license=('custom') +makedepends=('icu>=52.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + 001-log_fix_dump_avx2.patch) +sha1sums=('61ed0e57d3c7c8985805bb0682de3f4c65f4b6e5' + 'a4a47cc5716df87d544ae7684aaf402287132d50') + +prepare() { + export _stagedir="${srcdir}/stagedir" + cd ${pkgbase}_${_boostver} + + patch -p0 -i ../001-log_fix_dump_avx2.patch + + # Add an extra python version. This does not replace anything and python 2.x need to be the default. + echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam + + # Support for OpenMPI + echo "using mpi ;" >> ./tools/build/v2/user-config.jam +} + +build() { + 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 "${_stagedir}"/bin + install tools/build/v2/engine/${_bindir}/b2 "${_stagedir}"/bin/b2 + + pushd tools + for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" $_tool + done + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" library_status + popd + cp -a dist/bin/* "${_stagedir}"/bin + + # 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} -std=gnu++11 -O3" linkflags="${LDFLAGS}" \ + --layout=system \ + --prefix="${_stagedir}" \ + ${JOBS} \ + install +} + +package_boost() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + 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 + find "${_stagedir}"/lib -name \*.a -exec mv {} "${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" + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +}