Steve M. Robbins <s...@debian.org> (2014-03-01):
> tags 739807 + pending
> thanks

Just in case the upload doesn't happen, please find attached the tested
patch I had been working on and testing during the past hour…

Mraw,
KiBi.
diff -Nru boost1.54-1.54.0/debian/changelog boost1.54-1.54.0/debian/changelog
--- boost1.54-1.54.0/debian/changelog	2013-12-04 07:50:49.000000000 +0100
+++ boost1.54-1.54.0/debian/changelog	2014-03-01 18:03:36.000000000 +0100
@@ -1,3 +1,12 @@
+boost1.54 (1.54.0-4.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Backport “Changeset 84950” from the boost 1.55 branch to fix
+    “'uintptr_t' was not declared in this scope”. (Closes: #739807).
+    New patch: fix-for-int64_t-on-recent-libc.patch
+
+ -- Cyril Brulebois <k...@debian.org>  Sat, 01 Mar 2014 17:42:43 +0100
+
 boost1.54 (1.54.0-4) unstable; urgency=low
 
   [ Dmitrijs Ledkovs ]
diff -Nru boost1.54-1.54.0/debian/patches/fix-for-int64_t-on-recent-libc.patch boost1.54-1.54.0/debian/patches/fix-for-int64_t-on-recent-libc.patch
--- boost1.54-1.54.0/debian/patches/fix-for-int64_t-on-recent-libc.patch	1970-01-01 01:00:00.000000000 +0100
+++ boost1.54-1.54.0/debian/patches/fix-for-int64_t-on-recent-libc.patch	2014-03-01 18:03:39.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Fix "'uintptr_t' was not declared in this scope"
+Origin: https://svn.boost.org/trac/boost/changeset/84950
+Bug-Debian: http://bugs.debian.org/739904
+--- a/boost/cstdint.hpp
++++ b/boost/cstdint.hpp
+@@ -41,7 +41,10 @@
+ // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
+ // 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.
+ # ifdef __hpux
diff -Nru boost1.54-1.54.0/debian/patches/series boost1.54-1.54.0/debian/patches/series
--- boost1.54-1.54.0/debian/patches/series	2013-12-01 21:19:17.000000000 +0100
+++ boost1.54-1.54.0/debian/patches/series	2014-03-01 18:03:39.000000000 +0100
@@ -12,3 +12,4 @@
 85160.patch
 ELFv2-libboost1.54-dev-context-asm.patch
 hppa-long-double-config.patch
+fix-for-int64_t-on-recent-libc.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to