mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 19:15:39 +00:00
2a36c61541
Glibc 2.18 no longer defines __GLIBC_HAVE_LONG_LONG. http://hydra.nixos.org/build/7003618
16 lines
865 B
Diff
16 lines
865 B
Diff
diff -ru -x '*~' boost_1_49_0-orig/boost/cstdint.hpp boost_1_49_0/boost/cstdint.hpp
|
|
--- boost_1_49_0-orig/boost/cstdint.hpp 2012-01-29 22:58:13.000000000 +0100
|
|
+++ boost_1_49_0/boost/cstdint.hpp 2013-12-10 11:48:19.304042208 +0100
|
|
@@ -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
|