| 1 |
scarabeus 12/08/01 09:16:35 |
| 2 |
|
| 3 |
Added: 0.6.0-fix-boost-1.50-linking.patch |
| 4 |
0.6.0-fix-missing-includes.patch |
| 5 |
Log: |
| 6 |
Fix boost build and missing includes install. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/mdds/files/0.6.0-fix-boost-1.50-linking.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-fix-boost-1.50-linking.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-fix-boost-1.50-linking.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0.6.0-fix-boost-1.50-linking.patch |
| 17 |
=================================================================== |
| 18 |
From 09937e5d6b4b82efbff40da2aa50fb02f2250bb2 Mon Sep 17 00:00:00 2001 |
| 19 |
From: David Tardon <dtardon@××××××.com> |
| 20 |
Date: Sat, 28 Jul 2012 14:32:47 +0200 |
| 21 |
Subject: [PATCH] fix linking error with boost 1.50 |
| 22 |
|
| 23 |
--- |
| 24 |
include/mdds/mixed_type_matrix_storage.hpp | 4 ++++ |
| 25 |
1 file changed, 4 insertions(+) |
| 26 |
|
| 27 |
diff --git a/include/mdds/mixed_type_matrix_storage.hpp b/include/mdds/mixed_type_matrix_storage.hpp |
| 28 |
index fa0bf25..bb4e354 100644 |
| 29 |
--- a/include/mdds/mixed_type_matrix_storage.hpp |
| 30 |
+++ b/include/mdds/mixed_type_matrix_storage.hpp |
| 31 |
@@ -32,6 +32,10 @@ |
| 32 |
|
| 33 |
#include <boost/ptr_container/ptr_vector.hpp> |
| 34 |
#include <boost/ptr_container/ptr_map.hpp> |
| 35 |
+// Boost.Pool indirectly pulls in Boost.System, causing linking error |
| 36 |
+// with Boost 1.50, because some (deprecated) symbols from System are |
| 37 |
+// not found. |
| 38 |
+#define BOOST_SYSTEM_NO_DEPRECATED |
| 39 |
#include <boost/pool/object_pool.hpp> |
| 40 |
|
| 41 |
namespace mdds { |
| 42 |
-- |
| 43 |
1.7.11.2 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 dev-util/mdds/files/0.6.0-fix-missing-includes.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-fix-missing-includes.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-fix-missing-includes.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: 0.6.0-fix-missing-includes.patch |
| 54 |
=================================================================== |
| 55 |
diff -urN mdds_0.6.0/Makefile.in mdds_0.6.0.new//Makefile.in |
| 56 |
--- mdds_0.6.0/Makefile.in 2012-07-19 05:09:49.000000000 +0200 |
| 57 |
+++ mdds_0.6.0.new//Makefile.in 2012-08-01 11:11:25.193466139 +0200 |
| 58 |
@@ -21,6 +21,7 @@ |
| 59 |
multi_type_vector_test_custom |
| 60 |
|
| 61 |
HEADERS= \ |
| 62 |
+ $(INCDIR)/mdds/compat/unique_ptr.hpp \ |
| 63 |
$(INCDIR)/mdds/flat_segment_tree_def.inl \ |
| 64 |
$(INCDIR)/mdds/flat_segment_tree.hpp \ |
| 65 |
$(INCDIR)/mdds/flat_segment_tree_itr.hpp \ |
| 66 |
@@ -200,9 +201,11 @@ |
| 67 |
install: $(HEADERS) |
| 68 |
install -d $(DESTDIR)@includedir@/mdds |
| 69 |
install -d $(DESTDIR)@includedir@/mdds/hash_container |
| 70 |
+ install -d $(DESTDIR)@includedir@/mdds/compat |
| 71 |
install -d $(DESTDIR)@docdir@ |
| 72 |
install -m 644 -t $(DESTDIR)@includedir@/mdds $(INCDIR)/mdds/*.hpp |
| 73 |
install -m 644 -t $(DESTDIR)@includedir@/mdds $(INCDIR)/mdds/*.inl |
| 74 |
+ install -m 644 -t $(DESTDIR)@includedir@/mdds/compat $(INCDIR)/mdds/compat/*.hpp |
| 75 |
install -m 644 -t $(DESTDIR)@includedir@/mdds/hash_container $(INCDIR)/mdds/hash_container/*.hpp |
| 76 |
install -m 644 -t $(DESTDIR)@docdir@ AUTHORS COPYING NEWS README VERSION |
Archives