summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2017-04-09 12:22:12 +0200
committerPacho Ramos <pacho@gentoo.org>2017-04-09 13:04:22 +0200
commit9cbbcfa81f0786a10daf0693b2a10a5627631ccb (patch)
tree6da4fc42f6b5c8ba18d0bf26fa0c32f1ab73fb05
parentlicenses: Update repoze from dev-python/repoze-lru. (diff)
downloadgentoo-9cbbcfa81f0786a10daf0693b2a10a5627631ccb.tar.gz
gentoo-9cbbcfa81f0786a10daf0693b2a10a5627631ccb.tar.bz2
gentoo-9cbbcfa81f0786a10daf0693b2a10a5627631ccb.zip
sci-visualization/nonolith-connect: Fix gcc6 support (#594330 by Peter Levine)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
-rw-r--r--sci-visualization/nonolith-connect/files/1.1-gcc6.patch14
-rw-r--r--sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild18
2 files changed, 23 insertions, 9 deletions
diff --git a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
new file mode 100644
index 00000000000..815c3ca866c
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
@@ -0,0 +1,14 @@
+--- nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp.old 2016-09-25 18:13:31.820474134 -0400
++++ nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp 2016-09-25 18:38:52.654567787 -0400
+@@ -41,8 +41,11 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++
++#if __cplusplus < 201103L
+ #include <ext/algorithm>
+ using __gnu_cxx::copy_n;
++#endif
+
+ using websocketpp::server_session;
+
diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
index c33a929da91..955e544fbc6 100644
--- a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
+++ b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils scons-utils toolchain-funcs user
+inherit scons-utils toolchain-funcs user
DESCRIPTION="CEE (Control - Experiment - Explore) analog multitool"
HOMEPAGE="http://www.nonolithlabs.com/cee/"
@@ -16,20 +16,20 @@ IUSE=""
RDEPEND="
dev-libs/boost
- virtual/udev"
+ virtual/udev
+"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PV}-cflags-respect.patch" )
+PATCHES=(
+ "${FILESDIR}/${PV}-cflags-respect.patch"
+ "${FILESDIR}/${PV}-gcc6.patch"
+)
pkg_setup() {
tc-export CC CXX
enewuser nonolithd -1 -1 /dev/null usb
}
-src_prepare() {
- epatch "${PATCHES[@]}"
-}
-
src_configure() {
myesconsargs=(
boost_static=0