Source: deal.ii
Version: 7.1.0-1
Severity: normal
Tags: patch
thanks

deal.ii currently builds against Boost version 1.46.1 which it ships
with its own sources. The debian/rules file tries to specify the Boost
include path with the options
--with-boost-libs=/usr/lib --with-boost-include=/usr/include/boost
which seem to have no effect.
These options need to be replaced by
--with-boost=/usr/include

Additionally deal.ii has hardcoded the inclusion of its own copy of
Boost headers in one source file. These have been changed to include
from the system paths in the attached patch.

Kind Regards,
Felix
Description: include boost headers from system path
 Currently deal.ii only works with the included copy of Boost 1.46.1.
 To include Debians version of Boost, a few include paths need to be adjusted.
Author: Felix Gruber <fel...@gmx.de>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/source/base/boost_serialization.cc
+++ b/source/base/boost_serialization.cc
@@ -13,32 +13,32 @@
 
 #include <deal.II/base/config.h>
 
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_archive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_iarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_iserializer.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_oarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_oserializer.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_pointer_iserializer.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_pointer_oserializer.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_serializer_map.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_text_iprimitive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_text_oprimitive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/basic_xml_archive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/binary_iarchive.cpp"
+#include <boost/archive/basic_archive.hpp>
+#include <boost/archive/detail/basic_iarchive.hpp>
+#include <boost/archive/detail/basic_iserializer.hpp>
+#include <boost/archive/detail/basic_oarchive.hpp>
+#include <boost/archive/detail/basic_oserializer.hpp>
+#include <boost/archive/detail/basic_pointer_iserializer.hpp>
+#include <boost/archive/detail/basic_pointer_oserializer.hpp>
+#include <boost/archive/detail/basic_serializer_map.hpp>
+#include <boost/archive/basic_text_iprimitive.hpp>
+#include <boost/archive/basic_text_oprimitive.hpp>
+#include <boost/archive/basic_xml_archive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
 
-#include "../../contrib/boost-1.46.1/libs/serialization/src/binary_oarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/extended_type_info.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/extended_type_info_typeid.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/extended_type_info_no_rtti.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/polymorphic_iarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/polymorphic_oarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/stl_port.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/text_iarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/text_oarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/void_cast.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/archive_exception.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_grammar.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_iarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_oarchive.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/xml_archive_exception.cpp"
-#include "../../contrib/boost-1.46.1/libs/serialization/src/shared_ptr_helper.cpp"
+#include <boost/archive/binary_oarchive.hpp>
+#include <boost/serialization/extended_type_info.hpp>
+#include <boost/serialization/extended_type_info_typeid.hpp>
+#include <boost/serialization/extended_type_info_no_rtti.hpp>
+#include <boost/archive/polymorphic_iarchive.hpp>
+#include <boost/archive/polymorphic_oarchive.hpp>
+//#include <boost/serialization/stl_port.hpp>
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/serialization/void_cast.hpp>
+#include <boost/archive/archive_exception.hpp>
+//#include <boost/serialization/xml_grammar.hpp>
+#include <boost/archive/xml_iarchive.hpp>
+#include <boost/archive/xml_oarchive.hpp>
+//#include <boost/serialization/xml_archive_exception.hpp>
+#include <boost/archive/shared_ptr_helper.hpp>

Reply via email to