diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-19 12:09:59 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-19 12:09:59 +0200 |
| commit | b17208557669f7d787c139c7f15913be60db7b1b (patch) | |
| tree | ffff55729461c274bd3a8b144fddbfdad6795456 /extra/boost | |
| parent | 911a818dc1dde41745d065b1272333f5668ed270 (diff) | |
| parent | 26606f981048ee9efcda690b619d3c53501a7a58 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/goaccess/PKGBUILD
core/glib2/PKGBUILD
extra/antlr2/PKGBUILD
Diffstat (limited to 'extra/boost')
| -rw-r--r-- | extra/boost/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/boost/fix-new-glibc.patch | 14 |
2 files changed, 21 insertions, 5 deletions
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 1fd5c6f5a..9a12edd1b 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190035 2013-07-13 12:40:22Z svenstaro $ +# $Id: PKGBUILD 193196 2013-08-18 16:43:01Z svenstaro $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -10,18 +10,19 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.54.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 url="http://www.boost.org/" arch=('i686' 'x86_64' 'mips64el') license=('custom') makedepends=('icu>=51.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) + boost-1.54.0-Fix-macro-for-int128-detection.patch + fix-new-glibc.patch) sha1sums=('069501636097d3f40ddfd996d29748bb23591c53' '34026072a7cb2534164f20e77bb71a5c75093307' - 'bf5177694ab8a0df6bc13aa47b05727c40febebb') - + 'bf5177694ab8a0df6bc13aa47b05727c40febebb' + 'e3a5fac340c12b39add50070efb439b857108a0b') build() { export _stagedir="${srcdir}/stagedir" @@ -30,6 +31,7 @@ build() { cd "${srcdir}/${pkgbase}_${_boostver}" patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch + patch -Np2 -i ../fix-new-glibc.patch # Fix build errors with python 3 sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh diff --git a/extra/boost/fix-new-glibc.patch b/extra/boost/fix-new-glibc.patch new file mode 100644 index 000000000..5daa11cf5 --- /dev/null +++ b/extra/boost/fix-new-glibc.patch @@ -0,0 +1,14 @@ +Index: /trunk/boost/cstdint.hpp
+===================================================================
+--- /trunk/boost/cstdint.hpp (revision 84805)
++++ /trunk/boost/cstdint.hpp (revision 84950)
+@@ -42,5 +42,8 @@
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H) \
++ && (!defined(__GLIBC__) \
++ || defined(__GLIBC_HAVE_LONG_LONG) \
++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+
+ // The following #include is an implementation artifact; not part of interface.
|