[fusecompress] Rebuild for Boost-1.48 Fixes the compilation error with Boost-1.48 (thanks to Petr Machata: #760616)

Denis Arnaud denisarnaud at fedoraproject.org
Thu Dec 8 15:15:23 UTC 2011


commit 797abe2d4968edb8370b5dca170eca134fb3fffc
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Thu Dec 8 16:15:17 2011 +0100

    Rebuild for Boost-1.48
    Fixes the compilation error with Boost-1.48 (thanks to Petr Machata: #760616)

 fusecompress-boost-1.48.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 fusecompress.spec             |   16 +++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/fusecompress-boost-1.48.patch b/fusecompress-boost-1.48.patch
new file mode 100644
index 0000000..f8d9e79
--- /dev/null
+++ b/fusecompress-boost-1.48.patch
@@ -0,0 +1,41 @@
+diff --git a/src/boost/archive/portable_binary_iarchive.hpp b/src/boost/archive/portable_binary_iarchive.hpp
+index 6aed491..37aabf9 100644
+--- a/src/boost/archive/portable_binary_iarchive.hpp
++++ b/src/boost/archive/portable_binary_iarchive.hpp
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ #include <boost/integer/endian.hpp>
+-#include <boost/math/fpclassify.hpp>
++#include <boost/math/special_functions/fpclassify.hpp>
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/lexical_cast.hpp>
+ 
+diff --git a/src/boost/archive/portable_binary_iarchive.hpp b/src/boost/archive/portable_binary_iarchive.hpp
+index 6aed491..37aabf9 100644
+--- a/src/boost/archive/portable_binary_oarchive.hpp
++++ b/src/boost/archive/portable_binary_oarchive.hpp
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ #include <boost/integer/endian.hpp>
+-#include <boost/math/fpclassify.hpp>
++#include <boost/math/special_functions/fpclassify.hpp>
+ #include <boost/utility/enable_if.hpp>
+ 
+ #include <boost/type_traits/is_unsigned.hpp>
+index 10a66b7..4b56d9d 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -27,10 +27,6 @@ noinst_HEADERS = \
+ 	boost/archive/portable_binary_iarchive.hpp \
+ 	boost/integer/cover_operators.hpp \
+ 	boost/integer/endian.hpp \
+-	boost/math/fpclassify.hpp \
+-	boost/math/nonfinite_num_facets.hpp \
+-	boost/math/signbit.hpp \
+-	boost/math/detail/fp_traits.hpp \
+ 	CompressionType.hpp \
+ 	CompressedMagic.hpp \
+ 	FileRememberTimes.hpp \
+
diff --git a/fusecompress.spec b/fusecompress.spec
index 1a7baad..cd631b3 100644
--- a/fusecompress.spec
+++ b/fusecompress.spec
@@ -18,6 +18,16 @@ Source0: fusecompress-20110801.tar.xz
 Source1:        README.fedora
 # https://developer.berlios.de/bugs/?func=detailbug&bug_id=18285&group_id=5384
 Patch1:         fusecompress-boost-1.44.patch
+# Compilation issue with Boost.Math for Boost-1.48
+# Fedora ticket: https://bugzilla.redhat.com/show_bug.cgi?id=760616
+# Upstream ticket (BerliOS): https://developer.berlios.de/bugs/?func=detailbug&bug_id=18442&group_id=5384
+# Upstream ticket (GitHub): https://github.com/tex/fusecompress/pull/7
+# Upstream keeps a partial embedded version of the Boost source tree.
+# That version seems outdated, and is incomplete. There are some clashes with
+# upstream Boost for the missing parts (e.g., with Boost.Lexical_Cast).
+# The tactic, to fix the issue here, is to remove the embedded Boost.Math
+# source tree part.
+Patch2:         fusecompress-boost-1.48.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fuse-devel file-devel boost-devel
@@ -36,7 +46,10 @@ compressed files and user applications.
 
 %prep
 %setup -q -n fusecompress-%{version}
-%patch1 -p1 -b .boost
+%patch1 -p1 -b .boost44
+%patch2 -p1 -b .boost48
+
+rm -Rf src/boost/math
 
 autoreconf -fi
 
@@ -74,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Dec 06 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2.6-12.20110801git913897f4
 - Rebuild for Boost-1.48
+- Fixes the compilation error with Boost-1.48 (thanks to Petr Machata: #760616)
 
 * Mon Aug 01 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-11.20110801git913897f4
 - Update to newer upstream snapshot


More information about the scm-commits mailing list