mgorny      14/03/13 14:58:03

  Added:                scientificpython-2.9.3-mpi-netcdf.patch
  Log:
  Version bump. Use python_doexe() to switch Python wrapping to eclass, bug 
#484416.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.1                  
dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch?rev=1.1&content-type=text/plain

Index: scientificpython-2.9.3-mpi-netcdf.patch
===================================================================
>From 71a5e881290c1cec2506a346e2740a1b821c36aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
Date: Thu, 13 Mar 2014 15:29:33 +0100
Subject: [PATCH] Include MPI cflags/ldflags for netcdf.

---
 setup.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 7f01656..71ac92a 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from distutils.core import setup, Extension
 from distutils.command.install_headers import install_headers
-import os, sys, platform
+import os, sys, platform, subprocess
 from glob import glob
 
 class Dummy:
@@ -92,13 +92,16 @@ else:
         netcdf_include = os.path.join(netcdf_prefix, 'include')
         netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h')
         netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+    mpi_cflags = subprocess.Popen(["mpicc", "-showme:compile"], 
stdout=subprocess.PIPE).communicate()[0].rstrip().split()
+    mpi_ldflags = subprocess.Popen(["mpicc", "-showme:link"], 
stdout=subprocess.PIPE).communicate()[0].rstrip().split()
     ext_modules = [Extension('Scientific._netcdf',
                              ['Scientific/_netcdf.c'],
                              include_dirs=['Include', netcdf_include]
                                           + numpy_include,
                              library_dirs=[netcdf_lib],
                              libraries = ['netcdf'],
-                             extra_compile_args=extra_compile_args)]
+                             extra_compile_args=extra_compile_args + 
mpi_cflags,
+                             extra_link_args=mpi_ldflags)]
 
 try:
     # Add code for including documentation in Mac packages
-- 
1.9.0





Reply via email to