diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-07-24 03:26:40 -0400 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2017-07-24 16:28:12 +0200 |
| commit | 561d2af41a1662af7b81bedefc55a3f2e7f2ff70 (patch) | |
| tree | f15d602614d4d38370ce68075025927543e2aec8 /dev-python/jpype | |
| parent | www-client/seamonkey: De-uglify new enigmail code a bit. (diff) | |
| download | gentoo-561d2af41a1662af7b81bedefc55a3f2e7f2ff70.tar.gz gentoo-561d2af41a1662af7b81bedefc55a3f2e7f2ff70.tar.bz2 gentoo-561d2af41a1662af7b81bedefc55a3f2e7f2ff70.zip | |
dev-python/jpype: fix building with -Werror=terminate using GCC-6.
Gentoo-Bug: https://bugs.gentoo.org/608920
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5194
Diffstat (limited to 'dev-python/jpype')
| -rw-r--r-- | dev-python/jpype/files/jpype-gcc6-noexcept.patch | 57 | ||||
| -rw-r--r-- | dev-python/jpype/jpype-0.6.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/jpype/jpype-0.6.2.ebuild | 2 |
3 files changed, 62 insertions, 1 deletions
diff --git a/dev-python/jpype/files/jpype-gcc6-noexcept.patch b/dev-python/jpype/files/jpype-gcc6-noexcept.patch new file mode 100644 index 000000000000..710844d35608 --- /dev/null +++ b/dev-python/jpype/files/jpype-gcc6-noexcept.patch @@ -0,0 +1,57 @@ +Bug: https://bugs.gentoo.org/show_bug.cgi?id=608920
+Upstream commit: https://github.com/originell/jpype/commit/3a4fb98938afd9c03070086d1b8fda8841410fa3
+
+From c3578c3488de35236f73b6eb27428b1f1526c45b Mon Sep 17 00:00:00 2001 +From: Peter-Levine <plevine457@gmail.com> +Date: Sat, 11 Feb 2017 23:31:27 -0500 +Subject: [PATCH] Mark destructor that throws as noexcept(false) for >=C++11 + +--- + native/common/include/jp_field.h | 2 +- + native/common/include/jpype.h | 6 ++++++ + native/common/jp_field.cpp | 2 +- + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/native/common/include/jp_field.h b/native/common/include/jp_field.h +index d28b795..f93752c 100644 +--- a/native/common/include/jp_field.h ++++ b/native/common/include/jp_field.h +@@ -38,7 +38,7 @@ public : + /**
+ * destructor
+ */
+- virtual ~JPField();
++ virtual ~JPField() NO_EXCEPT_FALSE;
+
+ public :
+ bool isStatic() const;
+diff --git a/native/common/include/jpype.h b/native/common/include/jpype.h +index 7db5832..a492d06 100644 +--- a/native/common/include/jpype.h ++++ b/native/common/include/jpype.h +@@ -64,6 +64,12 @@ + #define PyUnicode_FromFormat PyString_FromFormat
+ #endif
+
++// Define this and use to allow destructors to throw in C++11 or later
++#if __cplusplus >= 201103L
++#define NO_EXCEPT_FALSE noexcept(false)
++#else
++#define NO_EXCEPT_FALSE
++#endif
+
+ #include <map>
+ #include <string>
+diff --git a/native/common/jp_field.cpp b/native/common/jp_field.cpp +index 8c75e58..5ef9d8c 100644 +--- a/native/common/jp_field.cpp ++++ b/native/common/jp_field.cpp +@@ -63,7 +63,7 @@ JPField::JPField(const JPField& fld) + TRACE_OUT;
+ }
+
+-JPField::~JPField()
++JPField::~JPField() NO_EXCEPT_FALSE
+ {
+ TRACE_IN("JPField::~JPField");
+ JPEnv::getJava()->DeleteGlobalRef(m_Field);
diff --git a/dev-python/jpype/jpype-0.6.1.ebuild b/dev-python/jpype/jpype-0.6.1.ebuild index 6ab0fe495434..090ec143ecb2 100644 --- a/dev-python/jpype/jpype-0.6.1.ebuild +++ b/dev-python/jpype/jpype-0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,6 +22,8 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=virtual/jdk-1.6" +PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch ) + python_compile() { if ! python_is_python3; then local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" diff --git a/dev-python/jpype/jpype-0.6.2.ebuild b/dev-python/jpype/jpype-0.6.2.ebuild index 3ea7f1fefbc3..f8dfefc0dd22 100644 --- a/dev-python/jpype/jpype-0.6.2.ebuild +++ b/dev-python/jpype/jpype-0.6.2.ebuild @@ -22,6 +22,8 @@ DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] >=virtual/jdk-1.6" +PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch ) + python_compile() { if ! python_is_python3; then local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" |