Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scientificpython/files/
Date: Sun, 13 Aug 2017 11:25:12
Message-Id: 1502623467.6edebd4caa22b73c12158228f11af8740be1af1d.soap@gentoo
1 commit: 6edebd4caa22b73c12158228f11af8740be1af1d
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 9 09:37:05 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 11:24:27 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6edebd4c
7
8 dev-python/scientificpython: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/5370
11
12 .../files/scientificpython-2.9.1-mpi-netcdf.patch | 29 ----------------------
13 1 file changed, 29 deletions(-)
14
15 diff --git a/dev-python/scientificpython/files/scientificpython-2.9.1-mpi-netcdf.patch b/dev-python/scientificpython/files/scientificpython-2.9.1-mpi-netcdf.patch
16 deleted file mode 100644
17 index 622032d4d17..00000000000
18 --- a/dev-python/scientificpython/files/scientificpython-2.9.1-mpi-netcdf.patch
19 +++ /dev/null
20 @@ -1,29 +0,0 @@
21 ---- setup.py
22 -+++ setup.py
23 -@@ -2,7 +2,7 @@
24 -
25 - from distutils.core import setup, Extension
26 - from distutils.command.install_headers import install_headers
27 --import os, sys, platform
28 -+import os, sys, platform, subprocess
29 - from glob import glob
30 -
31 - class Dummy:
32 -@@ -103,13 +103,16 @@
33 - netcdf_include = os.path.join(netcdf_prefix, 'include')
34 - netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h')
35 - netcdf_lib = os.path.join(netcdf_prefix, 'lib')
36 -+ mpi_cflags = subprocess.Popen(["mpicc", "-showme:compile"], stdout=subprocess.PIPE).communicate()[0].rstrip().split()
37 -+ mpi_ldflags = subprocess.Popen(["mpicc", "-showme:link"], stdout=subprocess.PIPE).communicate()[0].rstrip().split()
38 - ext_modules = [Extension('Scientific_netcdf',
39 - ['Src/Scientific_netcdf.c'],
40 - include_dirs=['Include', netcdf_include]
41 - + arrayobject_h_include,
42 - library_dirs=[netcdf_lib],
43 - libraries = ['netcdf'],
44 -- extra_compile_args=extra_compile_args)]
45 -+ extra_compile_args=extra_compile_args + mpi_cflags,
46 -+ extra_link_args=mpi_ldflags)]
47 -
48 - try:
49 - # Add code for including documentation in Mac packages