diff options
| author |   David Seifert <soap@gentoo.org> | 2016-10-08 00:00:22 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-10-08 00:00:22 +0200 |
| commit | a4ae38e90d917fe1c75c95f29444afa51e418889 (patch) | |
| tree | f39c138fe67440ce9c13db9b20c20cdbc23c323a /sci-libs/libmems | |
| parent | sci-chemistry/sparky: Allow for compiling with GCC 6 (diff) | |
| download | gentoo-a4ae38e90d917fe1c75c95f29444afa51e418889.tar.gz gentoo-a4ae38e90d917fe1c75c95f29444afa51e418889.tar.bz2 gentoo-a4ae38e90d917fe1c75c95f29444afa51e418889.zip | |
sci-libs/libmems: Allow building with Boost 1.62
Gentoo-bug: 595986
* Revbump to also fix USE=doc building
* Patch by Peter Levine
Package-Manager: portage-2.3.1
Diffstat (limited to 'sci-libs/libmems')
| -rw-r--r-- | sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch | 15 | ||||
| -rw-r--r-- | sci-libs/libmems/libmems-1.6_p1-r3.ebuild (renamed from sci-libs/libmems/libmems-1.6_p1-r2.ebuild) | 10 |
2 files changed, 25 insertions, 0 deletions
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 new file mode 100644 index 000000000000..609d0de0c478 --- /dev/null +++ b/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch @@ -0,0 +1,15 @@ +Shuffle around Boost type_traits, which otherwise causes issues with boost 1.62. +See also: https://bugs.gentoo.org/show_bug.cgi?id=595986 + +--- a/libMems/AbstractMatch.h ++++ b/libMems/AbstractMatch.h +@@ -16,8 +16,7 @@ + #include "libGenome/gnClone.h"
+ #include <vector>
+ #include <algorithm>
+-#include <boost/type_traits/remove_pointer.hpp>
+-#include <boost/type_traits/add_pointer.hpp>
++#include <boost/type_traits.hpp>
+ #include <boost/dynamic_bitset.hpp>
+ #include <libMems/SlotAllocator.h>
+ #include <libMems/configuration.h>
diff --git a/sci-libs/libmems/libmems-1.6_p1-r2.ebuild b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild index c00e615cd49b..ef5fd0a8d8a9 100644 --- a/sci-libs/libmems/libmems-1.6_p1-r2.ebuild +++ b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${P}-broken-constness.patch "${FILESDIR}"/${P}-format-security.patch "${FILESDIR}"/${P}-fix-c++14.patch + "${FILESDIR}"/${P}-boost-1.62-type-traits.patch ) src_prepare() { @@ -42,6 +43,15 @@ src_configure() { $(use_enable static-libs static) } +src_compile() { + default + + if use doc; then + doxygen doxygen.am || die + HTML_DOCS+=( html/. ) + fi +} + src_install() { default |