mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-27 21:27:27 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 71a5e881290c1cec2506a346e2740a1b821c36aa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@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
|
|
|