[arch-commits] Commit in boost/trunk (PKGBUILD fix-new-glibc.patch)

[Sven-Hendrik Haase]

    Date: Sunday, August 18, 2013 @ 18:42:40
  Author: svenstaro
Revision: 193195

upgpkg: boost 1.54.0-3

Add glibc patch, remove with next boost version

Added:
  boost/trunk/fix-new-glibc.patch
Modified:
  boost/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 ++++++----
 fix-new-glibc.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-18 12:18:48 UTC (rev 193194)
+++ PKGBUILD	2013-08-18 16:42:40 UTC (rev 193195)
@@ -10,19 +10,20 @@
 pkgname=('boost-libs' 'boost')
 pkgver=1.54.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=3
 url="http://www.boost.org/"
 arch=('i686' 'x86_64')
 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"
    local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
@@ -30,6 +31,7 @@
    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

Added: fix-new-glibc.patch
===================================================================
--- fix-new-glibc.patch	                        (rev 0)
+++ fix-new-glibc.patch	2013-08-18 16:42:40 UTC (rev 193195)
@@ -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.