diff options
| author | David Tardon <dtardon@redhat.com> | 2012-07-30 07:53:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-12 12:36:49 +0200 |
| commit | 547e2d66f590a076eed0941d6ae47c5727a6ed40 (patch) | |
| tree | ac2e0b3605f748d0d4d38f64355bb5ba87bc4100 /mdds | |
| parent | 6f86bad46d6cd64544bde1dc9367189c9a586c5e (diff) | |
fix linking error with boost 1.50
(cherry picked from commit 43a20bf6fc3213c38a77a2941a4999313bdfefbe)
Conflicts:
mdds/makefile.mk
Change-Id: Ib0892a4ff55fc8036feedad3b3fd093c86d0cb1a
Diffstat (limited to 'mdds')
| -rw-r--r-- | mdds/0001-fix-linking-error-with-boost-1.50.patch | 27 | ||||
| -rw-r--r-- | mdds/makefile.mk | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/mdds/0001-fix-linking-error-with-boost-1.50.patch b/mdds/0001-fix-linking-error-with-boost-1.50.patch new file mode 100644 index 000000000000..c5a4afc693fe --- /dev/null +++ b/mdds/0001-fix-linking-error-with-boost-1.50.patch @@ -0,0 +1,27 @@ +From 09937e5d6b4b82efbff40da2aa50fb02f2250bb2 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Sat, 28 Jul 2012 14:32:47 +0200 +Subject: [PATCH] fix linking error with boost 1.50 + +--- + include/mdds/mixed_type_matrix_storage.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/mdds/mixed_type_matrix_storage.hpp b/include/mdds/mixed_type_matrix_storage.hpp +index fa0bf25..bb4e354 100644 +--- a/include/mdds/mixed_type_matrix_storage.hpp ++++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_storage.hpp +@@ -32,6 +32,10 @@ + + #include <boost/ptr_container/ptr_vector.hpp> + #include <boost/ptr_container/ptr_map.hpp> ++// Boost.Pool indirectly pulls in Boost.System, causing linking error ++// with Boost 1.50, because some (deprecated) symbols from System are ++// not found. ++#define BOOST_SYSTEM_NO_DEPRECATED + #include <boost/pool/object_pool.hpp> + + namespace mdds { +-- +1.7.11.2 + diff --git a/mdds/makefile.mk b/mdds/makefile.mk index b759886d66bc..00638704d891 100644 --- a/mdds/makefile.mk +++ b/mdds/makefile.mk @@ -39,6 +39,8 @@ TARGET=mdds TARFILE_NAME=mdds_0.5.3 TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7 PATCH_FILES=mdds_0.5.3.patch +PATCH_FILES=\ + 0001-fix-linking-error-with-boost-1.50.patch \ CONFIGURE_DIR= CONFIGURE_ACTION= |