diff options
Diffstat (limited to 'extra/boost/PKGBUILD')
| -rw-r--r-- | extra/boost/PKGBUILD | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index b0bc5a2fc..29494d00d 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196738 2013-10-17 14:02:41Z andyrtr $ +# $Id: PKGBUILD 202226 2013-12-20 02:36:58Z svenstaro $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.54.0 +pkgver=1.55.0 _boostver=${pkgver//./_} pkgrel=4 url="http://www.boost.org/" @@ -16,52 +16,46 @@ 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 - boost-1.53.0-python3.patch - boost-1.54.0-Fix-macro-for-int128-detection.patch - fix-new-glibc.patch) -sha1sums=('069501636097d3f40ddfd996d29748bb23591c53' - '34026072a7cb2534164f20e77bb71a5c75093307' - 'bf5177694ab8a0df6bc13aa47b05727c40febebb' - 'e3a5fac340c12b39add50070efb439b857108a0b') + 001-log_fix_dump_avx2.patch) +sha1sums=('61ed0e57d3c7c8985805bb0682de3f4c65f4b6e5' + 'a4a47cc5716df87d544ae7684aaf402287132d50') -build() { +prepare() { export _stagedir="${srcdir}/stagedir" - local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" - - cd "${srcdir}/${pkgbase}_${_boostver}" - - patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch - patch -Np2 -i ../fix-new-glibc.patch + cd ${pkgbase}_${_boostver} - # Fix build errors with python 3 - sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh - patch -Np1 -i ../boost-1.53.0-python3.patch + patch -p0 -i ../001-log_fix_dump_avx2.patch - # Shut up strict aliasing warnings - echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam # 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 + + # 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" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" - install -d -m 755 "${_stagedir}"/bin - install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam + 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/bjam --toolset=gcc $_tool + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" $_tool done - "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status + "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" library_status popd cp -a dist/bin/* "${_stagedir}"/bin - #boostbook is needed by quickbook - install -d -m 755 "${_stagedir}"/share/boostbook + # 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 @@ -70,20 +64,19 @@ build() { # 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/bjam \ + "${_stagedir}"/bin/b2 \ variant=release \ debug-symbols=off \ threading=multi \ runtime-link=shared \ - link=shared \ + link=shared,static \ toolset=gcc \ python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \ --layout=system \ --prefix="${_stagedir}" \ ${JOBS} \ install - - find ${_stagedir} -name \*.a -exec rm -f {} \; } package_boost() { @@ -92,12 +85,18 @@ package_boost() { optdepends=('python: for python bindings' 'python2: for python2 bindings' 'boost-build: to use boost jam for building your project.') + options=('staticlibs') - install -d -m 755 "${pkgdir}"/usr + install -dm755 "${pkgdir}"/usr cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr - install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + 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() { @@ -105,9 +104,9 @@ package_boost-libs() { depends=('bzip2' 'zlib' 'icu') optdepends=('openmpi: for mpi support') - install -d -m 755 "${pkgdir}"/usr + install -dm755 "${pkgdir}"/usr cp -a "${_stagedir}"/lib "${pkgdir}"/usr - install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } |