public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/openbabel-python/, sci-chemistry/openbabel-python/files/
@ 2017-05-13 16:20 Justin Lecher
  0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2017-05-13 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2d4da3be6401b50a657e5a10296cf265fca3198c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 16:20:27 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 13 16:20:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4da3be

sci-chemistry/openbabel-python: Backport Fix for gcc 6/7

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=594154
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch | 13 +++++++++++++
 .../openbabel-python/openbabel-python-2.3.2.ebuild          |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch
new file mode 100644
index 00000000000..e23dc6020ee
--- /dev/null
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ee545cf..7f4b944e 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T)
+ # Get the GCC version - from KDE4 cmake files
+ if(CMAKE_COMPILER_IS_GNUCXX)
+   exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+-  string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++  string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+   # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+   # patch level, handle this here:
+   if (NOT _gcc_version)

diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
index e7a1cb5908b..704ad576bc7 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-testpybel.patch
 	"${FILESDIR}"/${P}-bindings_only.patch
 	"${FILESDIR}"/${P}-swig-3.0.3.patch
+	"${FILESDIR}"/${P}-gcc-6_and_7-backport.patch
 	)
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-05-13 16:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-13 16:20 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/openbabel-python/, sci-chemistry/openbabel-python/files/ Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox