| 1 |
commit: a4ae38e90d917fe1c75c95f29444afa51e418889 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 7 22:00:22 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 7 22:00:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ae38e9 |
| 7 |
|
| 8 |
sci-libs/libmems: Allow building with Boost 1.62 |
| 9 |
|
| 10 |
Gentoo-bug: 595986 |
| 11 |
* Revbump to also fix USE=doc building |
| 12 |
* Patch by Peter Levine |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.1 |
| 15 |
|
| 16 |
.../files/libmems-1.6_p1-boost-1.62-type-traits.patch | 15 +++++++++++++++ |
| 17 |
...{libmems-1.6_p1-r2.ebuild => libmems-1.6_p1-r3.ebuild} | 10 ++++++++++ |
| 18 |
2 files changed, 25 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch b/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..609d0de |
| 23 |
--- /dev/null |
| 24 |
+++ b/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch |
| 25 |
@@ -0,0 +1,15 @@ |
| 26 |
+Shuffle around Boost type_traits, which otherwise causes issues with boost 1.62. |
| 27 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=595986 |
| 28 |
+ |
| 29 |
+--- a/libMems/AbstractMatch.h |
| 30 |
++++ b/libMems/AbstractMatch.h |
| 31 |
+@@ -16,8 +16,7 @@ |
| 32 |
+ #include "libGenome/gnClone.h" |
| 33 |
+ #include <vector> |
| 34 |
+ #include <algorithm> |
| 35 |
+-#include <boost/type_traits/remove_pointer.hpp> |
| 36 |
+-#include <boost/type_traits/add_pointer.hpp> |
| 37 |
++#include <boost/type_traits.hpp> |
| 38 |
+ #include <boost/dynamic_bitset.hpp> |
| 39 |
+ #include <libMems/SlotAllocator.h> |
| 40 |
+ #include <libMems/configuration.h> |
| 41 |
|
| 42 |
diff --git a/sci-libs/libmems/libmems-1.6_p1-r2.ebuild b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild |
| 43 |
similarity index 86% |
| 44 |
rename from sci-libs/libmems/libmems-1.6_p1-r2.ebuild |
| 45 |
rename to sci-libs/libmems/libmems-1.6_p1-r3.ebuild |
| 46 |
index c00e615..ef5fd0a 100644 |
| 47 |
--- a/sci-libs/libmems/libmems-1.6_p1-r2.ebuild |
| 48 |
+++ b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild |
| 49 |
@@ -29,6 +29,7 @@ PATCHES=( |
| 50 |
"${FILESDIR}"/${P}-broken-constness.patch |
| 51 |
"${FILESDIR}"/${P}-format-security.patch |
| 52 |
"${FILESDIR}"/${P}-fix-c++14.patch |
| 53 |
+ "${FILESDIR}"/${P}-boost-1.62-type-traits.patch |
| 54 |
) |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
@@ -42,6 +43,15 @@ src_configure() { |
| 58 |
$(use_enable static-libs static) |
| 59 |
} |
| 60 |
|
| 61 |
+src_compile() { |
| 62 |
+ default |
| 63 |
+ |
| 64 |
+ if use doc; then |
| 65 |
+ doxygen doxygen.am || die |
| 66 |
+ HTML_DOCS+=( html/. ) |
| 67 |
+ fi |
| 68 |
+} |
| 69 |
+ |
| 70 |
src_install() { |
| 71 |
default |
Archives