From c4c5b186afb8e952a454bd71f84de64ef19fdaa929257ade2644655983a8b77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 18 Aug 2013 20:13:37 +0000 Subject: [PATCH] - Fix build with updated glibc: * boost-glibc-2.18.patch - taken from upstream scm OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=107 --- boost-glibc-2.18.patch | 15 +++++++++++++++ boost.changes | 6 ++++++ boost.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 boost-glibc-2.18.patch diff --git a/boost-glibc-2.18.patch b/boost-glibc-2.18.patch new file mode 100644 index 0000000..ee66b4a --- /dev/null +++ b/boost-glibc-2.18.patch @@ -0,0 +1,15 @@ +diff -urN boost_1_53_0/boost/cstdint.hpp boost_1_53_0.new/boost/cstdint.hpp +--- boost_1_53_0/boost/cstdint.hpp 2012-12-11 15:42:26.000000000 +0100 ++++ boost_1_53_0.new/boost/cstdint.hpp 2013-08-18 21:52:30.861956037 +0200 +@@ -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 --git a/boost.changes b/boost.changes index 06d25ef..1e120b5 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 18 20:11:52 UTC 2013 - tchvatal@suse.com + +- Fix build with updated glibc: + * boost-glibc-2.18.patch - taken from upstream scm + ------------------------------------------------------------------- Sat Jun 8 08:41:55 UTC 2013 - schwab@suse.de diff --git a/boost.spec b/boost.spec index 3cec7c2..2b8ddc4 100644 --- a/boost.spec +++ b/boost.spec @@ -112,6 +112,7 @@ Patch20: boost-strict_aliasing.patch Patch50: boost-use_std_xml_catalog.patch #PATCH-FIX-UPSTREAM Fix erroneous assembler code for ppc64 [boost#8374] Patch51: boost-fix_ppc64_asm.patch +Patch60: boost-glibc-2.18.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -404,6 +405,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch20 %patch50 %patch51 +%patch60 -p1 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} +